diff --git a/USERGUIDE.md b/USERGUIDE.md
index 4f190aa86..63d0dcae2 100644
--- a/USERGUIDE.md
+++ b/USERGUIDE.md
@@ -634,7 +634,7 @@ Activating or deactivating the built-in help systems that provides contextual in
 
 **Play videos immediately (override theme)**
 
-Some themes (including rbsimple-DE) display the game images briefly before playing the game videos. This setting forces the videos to be played immediately, regardless of the configuration in the theme.
+Some themes (including rbsimple-DE) display the game images briefly before playing the game videos. This setting forces the videos to be played immediately, regardless of the configuration in the theme. Note though that if there is a video available for a game, but no images, the video will always start to play immediately no matter the theme configuration or whether this settings has been enabled or not.
 
 **Show start menu in kid mode**
 
diff --git a/es-core/src/components/VideoComponent.cpp b/es-core/src/components/VideoComponent.cpp
index 686cdea35..4a41e6dc4 100644
--- a/es-core/src/components/VideoComponent.cpp
+++ b/es-core/src/components/VideoComponent.cpp
@@ -204,9 +204,13 @@ void VideoComponent::handleStartDelay()
         // If the setting to override the theme-supplied video delay setting has been enabled,
         // then play the video immediately.
         if (!Settings::getInstance()->getBool("PlayVideosImmediately")) {
-            if (mStartTime > SDL_GetTicks()) {
-                // Timeout not yet completed.
-                return;
+            // If there is a video file available but no static image, then start playing the
+            // video immediately regardless of theme configuration or settings.
+            if (mStaticImagePath != "") {
+                if (mStartTime > SDL_GetTicks()) {
+                    // Timeout not yet completed.
+                    return;
+                }
             }
         }
         // Completed.