diff --git a/packages/materialdesign-components/src/Common/ItemStore.js b/packages/materialdesign-components/src/Common/ItemStore.js
index cf0b7de24e..ed553cd847 100644
--- a/packages/materialdesign-components/src/Common/ItemStore.js
+++ b/packages/materialdesign-components/src/Common/ItemStore.js
@@ -38,7 +38,7 @@ function createItemsStore(componentOnSelect) {
     }
 
     function getItemIdx(items, itemId) {
-        return items.findIndex(i => i._id === itemId);
+        return items.findIndex(i => i && i._id === itemId);
     }
 
     return {