diff --git a/es-core/src/components/GameSelectorComponent.h b/es-core/src/components/GameSelectorComponent.h
index 4f16d7b09..b810be411 100644
--- a/es-core/src/components/GameSelectorComponent.h
+++ b/es-core/src/components/GameSelectorComponent.h
@@ -29,9 +29,8 @@ public:
     ~GameSelectorComponent()
     {
         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) != SystemData::sSystemVector.cend() ||
+            (SystemData::sSystemVector.size() != 0 && mSystem->isGroupedCustomCollection()))
             mSystem->getRootFolder()->setUpdateListCallback(nullptr);
     }