diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index e043be2a672..2e5b90195ca 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -539,7 +539,6 @@ func TestMain(m *testing.M) {
 	// initialise empty config - needed by some migrations
 	_ = config.InitializeEmpty()
 
-
 	ret := runTests(m)
 	os.Exit(ret)
 }
diff --git a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
index 3098a134da8..779c1202966 100644
--- a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
+++ b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
@@ -553,7 +553,9 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = ({
         enterOnRotate: true,
         exitOnRotate: true,
         lockOnRotate: true,
-        lockToLandscapeOnEnter: isLandscape,
+        lockToLandscapeOnEnter: uiConfig?.disableMobileMediaAutoRotateEnabled
+          ? false
+          : isLandscape,
       },
       touchControls: {
         disabled: true,
@@ -679,6 +681,7 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = ({
     autoplay,
     interfaceConfig?.autostartVideo,
     uiConfig?.alwaysStartFromBeginning,
+    uiConfig?.disableMobileMediaAutoRotateEnabled,
     _initialTimestamp,
   ]);
 
diff --git a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
index 84fc317dc38..78155f61a1a 100644
--- a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
@@ -278,6 +278,12 @@ export const SettingsInterfacePanel: React.FC = () => {
           checked={ui.enableChromecast ?? undefined}
           onChange={(v) => saveUI({ enableChromecast: v })}
         />
+        <BooleanSetting
+          id="disable-mobile-media-auto-rotate"
+          headingID="config.ui.scene_player.options.disable_mobile_media_auto_rotate"
+          checked={ui.disableMobileMediaAutoRotateEnabled ?? undefined}
+          onChange={(v) => saveUI({ disableMobileMediaAutoRotateEnabled: v })}
+        />
         <BooleanSetting
           id="show-scrubber"
           headingID="config.ui.scene_player.options.show_scrubber"
diff --git a/ui/v2.5/src/core/config.ts b/ui/v2.5/src/core/config.ts
index 55edf2d0115..41023de81a0 100644
--- a/ui/v2.5/src/core/config.ts
+++ b/ui/v2.5/src/core/config.ts
@@ -60,6 +60,9 @@ export interface IUIConfig {
   // if true the chromecast option will enabled
   enableChromecast?: boolean;
 
+  // if true the fullscreen mobile media auto-rotate option will be disabled
+  disableMobileMediaAutoRotateEnabled?: boolean;
+
   // if true continue scene will always play from the beginning
   alwaysStartFromBeginning?: boolean;
   // if true enable activity tracking
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index fd73e5851e3..0b3823d784a 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -701,6 +701,7 @@
             "heading": "Continue playlist by default"
           },
           "enable_chromecast": "Enable Chromecast",
+          "disable_mobile_media_auto_rotate": "Disable auto-rotate of fullscreen media on Mobile",
           "show_ab_loop_controls": "Show AB Loop plugin controls",
           "show_scrubber": "Show Scrubber",
           "track_activity": "Track Activity",
diff --git a/ui/v2.5/src/locales/fr-FR.json b/ui/v2.5/src/locales/fr-FR.json
index 209c685bd02..6037a7e35ba 100644
--- a/ui/v2.5/src/locales/fr-FR.json
+++ b/ui/v2.5/src/locales/fr-FR.json
@@ -690,6 +690,7 @@
                         "heading": "Continuer la liste de lecture par défaut"
                     },
                     "enable_chromecast": "Activer Chromecast",
+                    "disable_mobile_media_auto_rotate": "Désactiver la rotation automatique des médias en plein écran sur mobile",
                     "show_scrubber": "Montrer la barre de progression",
                     "track_activity": "Suivre l'activité",
                     "vr_tag": {
diff --git a/ui/v2.5/src/locales/sv-SE.json b/ui/v2.5/src/locales/sv-SE.json
index e62fb942a6b..83a6af7752d 100644
--- a/ui/v2.5/src/locales/sv-SE.json
+++ b/ui/v2.5/src/locales/sv-SE.json
@@ -680,6 +680,7 @@
                         "heading": "VR Tagg"
                     },
                     "enable_chromecast": "Aktivera Chromecast",
+                    "disable_mobile_media_auto_rotate": "Inaktivera automatisk rotering av helskärmsmedia på mobil",
                     "show_ab_loop_controls": "Visa AB-loop plugin kontroller"
                 }
             },