diff --git a/es-core/src/components/GameSelectorComponent.h b/es-core/src/components/GameSelectorComponent.h
index b08ffcc5a..4f16d7b09 100644
--- a/es-core/src/components/GameSelectorComponent.h
+++ b/es-core/src/components/GameSelectorComponent.h
@@ -31,6 +31,8 @@ public:
         if (std::find(SystemData::sSystemVector.cbegin(), SystemData::sSystemVector.cend(),
                       mSystem) != SystemData::sSystemVector.cend())
             mSystem->getRootFolder()->setUpdateListCallback(nullptr);
+        else if (SystemData::sSystemVector.size() != 0 && mSystem->isGroupedCustomCollection())
+            mSystem->getRootFolder()->setUpdateListCallback(nullptr);
     }
 
     enum class GameSelection {