diff --git a/es-app/src/SystemScreenSaver.cpp b/es-app/src/SystemScreenSaver.cpp
index 7dc09f18b..ca0dd6f77 100644
--- a/es-app/src/SystemScreenSaver.cpp
+++ b/es-app/src/SystemScreenSaver.cpp
@@ -323,10 +323,12 @@ void SystemScreenSaver::pickGameListNode(unsigned long index,
                     mCurrentGame = (*itf);
 
                     // End of getting FileData.
+                    #ifdef _RPI_
                     if (Settings::getInstance()->getString("ScreenSaverGameInfo") != "never")
                         writeSubtitle(mGameName.c_str(), mSystemName.c_str(),
                                 (Settings::getInstance()->getString("ScreenSaverGameInfo") ==
                                 "always"));
+                    #endif
                     return;
                 }
             }
diff --git a/es-app/src/guis/GuiVideoScreensaverOptions.cpp b/es-app/src/guis/GuiVideoScreensaverOptions.cpp
index e041a9fda..0a2599dc9 100644
--- a/es-app/src/guis/GuiVideoScreensaverOptions.cpp
+++ b/es-app/src/guis/GuiVideoScreensaverOptions.cpp
@@ -39,8 +39,10 @@ GuiVideoScreensaverOptions::GuiVideoScreensaverOptions(Window* window, const cha
     addWithLabel("USE OMX PLAYER FOR SCREENSAVER", ss_omx);
     addSaveFunc([ss_omx, this] { Settings::getInstance()->
             setBool("ScreenSaverOmxPlayer", ss_omx->getState()); });
-    #endif
 
+    // TEMPORARY - Disabled for now (except for RPI), need to find a proper way to make an
+    // overlay on top of the videos. The solution with rendering subtitles is not a good solution.
+    // And as well the VLC video player subtitles seem to be somehow broken.
     // Render video game name as subtitles.
     auto ss_info = std::make_shared<OptionListComponent<std::string>>
             (mWindow,getHelpStyle(), "SHOW GAME INFO", false);
@@ -54,7 +56,6 @@ GuiVideoScreensaverOptions::GuiVideoScreensaverOptions(Window* window, const cha
     addSaveFunc([ss_info, this] { Settings::getInstance()->
             setString("ScreenSaverGameInfo", ss_info->getSelected()); });
 
-    #ifdef _RPI_
     ComponentListRow row;
 
     // Set subtitle position.
diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp
index 1fc2c423f..1fcf544f5 100644
--- a/es-core/src/Settings.cpp
+++ b/es-core/src/Settings.cpp
@@ -99,7 +99,9 @@ void Settings::setDefaults()
     // UI settings -> screensaver settings -> video screensaver settings.
     mIntMap["ScreenSaverSwapVideoTimeout"] = 20000;
     mBoolMap["ScreenSaverStretchVideos"] = false;
+    #ifdef _RPI_
     mStringMap["ScreenSaverGameInfo"] = "never";
+    #endif
     mBoolMap["ScreenSaverVideoAudio"] = false;
 
     // UI settings -> screensaver settings -> slideshow screensaver settings.