diff --git a/src/datastores/handlers/base.js b/src/datastores/handlers/base.js
index d197bada36007..b21cd68e5e1e9 100644
--- a/src/datastores/handlers/base.js
+++ b/src/datastores/handlers/base.js
@@ -30,8 +30,11 @@ class Settings {
     // Theater Mode preference through this change.
     const defaultTheatreMode = await db.settings.findOneAsync({ _id: 'defaultTheatreMode' })
 
-    if (defaultTheatreMode?.value) {
-      await this.upsert('defaultViewingMode', 'theatre')
+    if (defaultTheatreMode) {
+      if (defaultTheatreMode.value) {
+        await this.upsert('defaultViewingMode', 'theatre')
+      }
+
       await db.settings.removeAsync({ _id: 'defaultTheatreMode' })
     }
 
diff --git a/src/renderer/components/ft-list-video/ft-list-video.js b/src/renderer/components/ft-list-video/ft-list-video.js
index 6014290001ff1..f3a6078308a35 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.js
+++ b/src/renderer/components/ft-list-video/ft-list-video.js
@@ -381,7 +381,7 @@ export default defineComponent({
     },
 
     externalPlayerIsDefaultViewingMode: function () {
-      return this.externalPlayer !== '' && this.$store.getters.getDefaultViewingMode === 'external_player'
+      return process.env.IS_ELECTRON && this.externalPlayer !== '' && this.$store.getters.getDefaultViewingMode === 'external_player'
     },
 
     defaultPlayback: function () {
@@ -486,16 +486,16 @@ export default defineComponent({
       return this.isInQuickBookmarkPlaylist ? 'base favorite' : 'base'
     },
 
-    watchVideoRoute() {
-      return {
-        path: `/watch/${this.id}`,
-        query: this.watchPageLinkQuery,
-      }
-    },
-
-    // For `router-link` attribute `to`
     watchVideoRouterLink() {
-      return !this.externalPlayerIsDefaultViewingMode ? this.watchVideoRoute : {}
+    // For `router-link` attribute `to`
+      if (!this.externalPlayerIsDefaultViewingMode) {
+        return {
+          path: `/watch/${this.id}`,
+          query: this.watchPageLinkQuery,
+        }
+      } else {
+        return {}
+      }
     },
 
     watchPageLinkQuery() {
diff --git a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
index 2308f9e839ca0..22bb821549c52 100644
--- a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
+++ b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
@@ -2809,7 +2809,7 @@ export default defineComponent({
      * it won't be finished in time, as the player destruction is asynchronous.
      * To workaround that we destroy the player first and wait for it to finish before we unmount this component.
      *
-     * @returns { startNextVideoInFullscreen: boolean, startNextVideoInFullwindow: boolean, startNextVideoInPip: boolean }
+     * @returns {Promise<{ startNextVideoInFullscreen: boolean, startNextVideoInFullwindow: boolean, startNextVideoInPip: boolean }>}
      */
     async function destroyPlayer() {
       ignoreErrors = true
diff --git a/src/renderer/components/player-settings/player-settings.js b/src/renderer/components/player-settings/player-settings.js
index b77c7eb3538c1..f643a097d652e 100644
--- a/src/renderer/components/player-settings/player-settings.js
+++ b/src/renderer/components/player-settings/player-settings.js
@@ -133,7 +133,7 @@ export default defineComponent({
 
     defaultViewingMode: function () {
       const defaultViewingMode = this.$store.getters.getDefaultViewingMode
-      if ((defaultViewingMode === 'external_player' && this.externalPlayer === '') ||
+      if ((defaultViewingMode === 'external_player' && (!process.env.IS_ELECTRON || this.externalPlayer === '')) ||
         (!process.env.IS_ELECTRON && (defaultViewingMode === 'fullscreen' || defaultViewingMode === 'pip'))) {
         return 'default'
       }