diff --git a/es-app/src/views/SystemView.cpp b/es-app/src/views/SystemView.cpp
index 66e42efbc..f8e82ff07 100644
--- a/es-app/src/views/SystemView.cpp
+++ b/es-app/src/views/SystemView.cpp
@@ -1014,7 +1014,7 @@ void SystemView::updateGameSelectors()
 
     for (auto& video : mSystemElements[cursor].videoComponents) {
         // If a static video has been set, then don't attempt to find a gameselector entry.
-        if (video->hasStaticVideo())
+        if (video->hasStaticVideo() || video->getThemeGameSelector() == ":none:")
             continue;
         GameSelectorComponent* gameSelector {nullptr};
         if (multipleSelectors) {
@@ -1055,7 +1055,7 @@ void SystemView::updateGameSelectors()
     }
 
     for (auto& video : mSystemElements[cursor].videoComponents) {
-        if (video->hasStaticVideo() ||
+        if (video->hasStaticVideo() || video->getThemeGameSelector() == ":none:" ||
             (video->getThemeImageTypes().size() == 0 && video->getDefaultImage() == ""))
             continue;
         GameSelectorComponent* gameSelector {nullptr};
diff --git a/es-core/src/components/VideoComponent.cpp b/es-core/src/components/VideoComponent.cpp
index f6b6a3e67..c297bc1bb 100644
--- a/es-core/src/components/VideoComponent.cpp
+++ b/es-core/src/components/VideoComponent.cpp
@@ -229,6 +229,7 @@ void VideoComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
             mConfig.staticVideoPath = staticPath;
         }
         else {
+            mThemeGameSelector = ":none:";
             LOG(LogWarning) << "VideoComponent: File defined for property \"path\" for element \""
                             << element.substr(6) << "\" does not exist: \"" << staticPath << "\"";
         }