diff --git a/src/main/java/gwt/material/design/addins/client/combobox/MaterialComboBox.java b/src/main/java/gwt/material/design/addins/client/combobox/MaterialComboBox.java
index d306e1bb6..568d5937a 100644
--- a/src/main/java/gwt/material/design/addins/client/combobox/MaterialComboBox.java
+++ b/src/main/java/gwt/material/design/addins/client/combobox/MaterialComboBox.java
@@ -520,13 +520,13 @@ public int getValueIndex(T value) {
      */
     public void setSelectedIndex(int selectedIndex) {
         this.selectedIndex = selectedIndex;
-        if (values.size() > 0) {
+        if (values.size() > selectedIndex) {
             T value = values.get(selectedIndex);
             if (value != null) {
                 $(listbox.getElement()).val(keyFactory.generateKey(value)).trigger("change.select2", selectedIndex);
-            } else {
-                GWT.log("Value index is not found.", new IndexOutOfBoundsException());
-            }
+            } 
+        } else {
+            GWT.log("Value index is not found.", new IndexOutOfBoundsException());
         }
     }
 
@@ -689,4 +689,4 @@ public ReadOnlyMixin<MaterialComboBox, MaterialWidget> getReadOnlyMixin() {
         }
         return readOnlyMixin;
     }
-}
\ No newline at end of file
+}