diff --git a/resources/scripts/github-actions/build-linux-mac.sh b/resources/scripts/github-actions/build-linux-mac.sh
index 8969b015f..f790ba98f 100755
--- a/resources/scripts/github-actions/build-linux-mac.sh
+++ b/resources/scripts/github-actions/build-linux-mac.sh
@@ -9,21 +9,24 @@ webengine="$2"
 if [[ "$os" == *"ubuntu"* ]]; then
   echo "We are building for GNU/Linux on Ubuntu."
   is_linux=true
-  libmpv="ON"
-  qtmultimedia="OFF"
   prefix="AppDir/usr"
 
   if [[ "$webengine" == "ON" ]]; then
+    libmpv="ON"
+    qtmultimedia="OFF"
     app_id="io.github.martinrotter.rssguard"
   else
+    libmpv="OFF"
+    qtmultimedia="ON"
     app_id="io.github.martinrotter.rssguardlite"
   fi
 else
   echo "We are building for macOS."
   is_linux=false
+  prefix="RSS Guard.app"
+
   libmpv="OFF"
   qtmultimedia="ON"
-  prefix="RSS Guard.app"
 fi
 
 echo "OS: $os; Not lite: $webengine"
diff --git a/src/librssguard/gui/mediaplayer/libmpv/libmpvbackend.cpp b/src/librssguard/gui/mediaplayer/libmpv/libmpvbackend.cpp
index e41fd5909..534832653 100644
--- a/src/librssguard/gui/mediaplayer/libmpv/libmpvbackend.cpp
+++ b/src/librssguard/gui/mediaplayer/libmpv/libmpvbackend.cpp
@@ -67,26 +67,27 @@ LibMpvBackend::LibMpvBackend(QWidget* parent)
 #endif
 
   mpv_set_option(m_mpvHandle, "wid", MPV_FORMAT_INT64, &wid);
+
   mpv_set_option_string(m_mpvHandle, "input-default-bindings", "yes");
-  // mpv_set_option_string(m_mpvHandle, "input-builtin-bindings", "no");
-  // mpv_set_option_string(m_mpvHandle, "input-test", "yes");
   mpv_set_option_string(m_mpvHandle, "msg-level", "all=v");
-
-#if !defined(NDEBUG)
-  mpv_set_option_string(m_mpvHandle, "terminal", "yes");
-#endif
-
-  mpv_set_option_string(m_mpvHandle, "keep-open", "yes");
-
-  // mpv_set_option_string(m_mpvHandle, "no-resume-playback", "yes");
-  // mpv_set_option_string(m_mpvHandle, "watch-later-dir", "mpv");
-  // mpv_set_option_string(m_mpvHandle, "config-dir", "mpv");
-
   mpv_set_option_string(m_mpvHandle, "config", "yes");
   mpv_set_option_string(m_mpvHandle, "hwdec", "auto");
   mpv_set_option_string(m_mpvHandle, "osd-playing-msg", "${media-title}");
   mpv_set_option_string(m_mpvHandle, "osc", "yes");
   mpv_set_option_string(m_mpvHandle, "input-cursor", "yes");
+  mpv_set_option_string(m_mpvHandle, "keep-open", "no");
+  mpv_set_option_string(m_mpvHandle, "idle", "yes");
+  mpv_set_option_string(m_mpvHandle, "save-position-on-quit", "no");
+  mpv_set_option_string(m_mpvHandle, "no-resume-playback", "yes");
+#if !defined(NDEBUG)
+  mpv_set_option_string(m_mpvHandle, "terminal", "yes");
+#endif
+
+  //
+  // mpv_set_option_string(m_mpvHandle, "watch-later-dir", "mpv");
+  // mpv_set_option_string(m_mpvHandle, "config-dir", "mpv");
+  // mpv_set_option_string(m_mpvHandle, "input-builtin-bindings", "no");
+  // mpv_set_option_string(m_mpvHandle, "input-test", "yes");
 
   // Enable keyboard input on the X11 window. For the messy details, see
   // --input-vo-keyboard on the manpage.
diff --git a/src/librssguard/gui/mediaplayer/mediaplayer.cpp b/src/librssguard/gui/mediaplayer/mediaplayer.cpp
index 2d7adb1ea..05053a2f1 100644
--- a/src/librssguard/gui/mediaplayer/mediaplayer.cpp
+++ b/src/librssguard/gui/mediaplayer/mediaplayer.cpp
@@ -36,7 +36,7 @@ MediaPlayer::MediaPlayer(QWidget* parent)
   onVideoAvailable(true);
   onMutedChanged(false);
   onPositionChanged(0);
-  onDurationChanged(100);
+  onDurationChanged(0);
   onSeekableChanged(true);
   onSpeedChanged(100);
   onVolumeChanged(50);