diff --git a/src/main/java/gwt/material/design/addins/client/autocomplete/MaterialAutoComplete.java b/src/main/java/gwt/material/design/addins/client/autocomplete/MaterialAutoComplete.java
index 68373a80a..e22cf957e 100644
--- a/src/main/java/gwt/material/design/addins/client/autocomplete/MaterialAutoComplete.java
+++ b/src/main/java/gwt/material/design/addins/client/autocomplete/MaterialAutoComplete.java
@@ -308,8 +308,11 @@ protected void onUnload() {
 
     protected void unloadHandlers() {
         removeHandler(itemBoxBlurHandler);
+        itemBoxBlurHandler = null;
         removeHandler(itemBoxKeyDownHandler);
+        itemBoxKeyDownHandler = null;
         removeHandler(itemBoxClickHandler);
+        itemBoxClickHandler = null;
     }
 
     /**
@@ -319,6 +322,7 @@ protected void setup(SuggestOracle suggestions) {
 
         if (itemBoxKeyDownHandler != null) {
             itemBoxKeyDownHandler.removeHandler();
+            itemBoxKeyDownHandler = null;
         }
 
         list.setStyleName(AddinsCssName.MULTIVALUESUGGESTBOX_LIST);