diff --git a/es-app/src/guis/GuiGeneralScreensaverOptions.cpp b/es-app/src/guis/GuiGeneralScreensaverOptions.cpp
index 59a582b72..f86d52d94 100644
--- a/es-app/src/guis/GuiGeneralScreensaverOptions.cpp
+++ b/es-app/src/guis/GuiGeneralScreensaverOptions.cpp
@@ -43,8 +43,8 @@ GuiGeneralScreensaverOptions::GuiGeneralScreensaverOptions(Window* window, const
     std::vector<std::string> screensavers;
     screensavers.push_back("dim");
     screensavers.push_back("black");
-    screensavers.push_back("random video");
     screensavers.push_back("slideshow");
+    screensavers.push_back("random video");
     for (auto it = screensavers.cbegin(); it != screensavers.cend(); it++)
         screensaver_behavior->add(*it, *it, Settings::getInstance()->
                 getString("ScreenSaverBehavior") == *it);
diff --git a/es-app/src/guis/GuiVideoScreensaverOptions.cpp b/es-app/src/guis/GuiVideoScreensaverOptions.cpp
index 6263bbf22..45ceb6831 100644
--- a/es-app/src/guis/GuiVideoScreensaverOptions.cpp
+++ b/es-app/src/guis/GuiVideoScreensaverOptions.cpp
@@ -104,14 +104,6 @@ GuiVideoScreensaverOptions::GuiVideoScreensaverOptions(Window* window, const cha
                 ss_omx_italic_font_file->getValue());
     });
     #endif
-
-    #ifndef _RPI_
-    auto captions_compatibility = std::make_shared<SwitchComponent>(mWindow);
-    captions_compatibility->setState(Settings::getInstance()->getBool("CaptionsCompatibility"));
-    addWithLabel("USE COMPATIBLE LOW RESOLUTION FOR CAPTIONS", captions_compatibility);
-    addSaveFunc([captions_compatibility] { Settings::getInstance()->
-    setBool("CaptionsCompatibility", captions_compatibility->getState()); });
-    #endif
 }
 
 GuiVideoScreensaverOptions::~GuiVideoScreensaverOptions()
diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp
index 13631788b..9f87f4821 100644
--- a/es-core/src/Settings.cpp
+++ b/es-core/src/Settings.cpp
@@ -101,7 +101,6 @@ void Settings::setDefaults()
     mBoolMap["StretchVideoOnScreenSaver"] = false;
     mStringMap["ScreenSaverGameInfo"] = "never";
     mBoolMap["ScreenSaverVideoMute"] = false;			// Raspberry Pi only
-    mBoolMap["CaptionsCompatibility"] = true;
 
     // UI settings -> screensaver settings -> slideshow screensaver settings.
     mIntMap["ScreenSaverSwapImageTimeout"] = 10000;
diff --git a/es-core/src/components/VideoVlcComponent.cpp b/es-core/src/components/VideoVlcComponent.cpp
index 75ef2a8e1..dbd09b7e9 100644
--- a/es-core/src/components/VideoVlcComponent.cpp
+++ b/es-core/src/components/VideoVlcComponent.cpp
@@ -299,25 +299,8 @@ void VideoVlcComponent::startVideo()
                 libvlc_media_tracks_release(tracks, track_count);
 
                 // Make sure we found a valid video track.
+
                 if ((mVideoWidth > 0) && (mVideoHeight > 0)) {
-                    #ifndef _RPI_
-                    if (mScreensaverMode) {
-                        if (!Settings::getInstance()->getBool("CaptionsCompatibility")) {
-
-                            Vector2f resizeScale((Renderer::getScreenWidth() / (float)mVideoWidth),
-                                    (Renderer::getScreenHeight() / (float)mVideoHeight));
-
-                            if (resizeScale.x() < resizeScale.y()) {
-                                mVideoWidth = (unsigned int) (mVideoWidth * resizeScale.x());
-                                mVideoHeight = (unsigned int) (mVideoHeight * resizeScale.x());
-                            }
-                            else {
-                                mVideoWidth = (unsigned int) (mVideoWidth * resizeScale.y());
-                                mVideoHeight = (unsigned int) (mVideoHeight * resizeScale.y());
-                            }
-                        }
-                    }
-                    #endif
                     PowerSaver::pause();
                     setupContext();