diff --git a/lib/screens/channel/video/video.dart b/lib/screens/channel/video/video.dart
index aa45f3cb..80dd6627 100644
--- a/lib/screens/channel/video/video.dart
+++ b/lib/screens/channel/video/video.dart
@@ -35,7 +35,8 @@ class _VideoState extends State<Video> with WidgetsBindingObserver {
   ) async {
     if (Platform.isAndroid &&
         !await SimplePip.isAutoPipAvailable &&
-        lifecycleState == AppLifecycleState.inactive) {
+        lifecycleState == AppLifecycleState.inactive &&
+        widget.videoStore.settingsStore.showVideo) {
       widget.videoStore.requestPictureInPicture();
     }
   }
diff --git a/lib/screens/channel/video/video_store.dart b/lib/screens/channel/video/video_store.dart
index af3574e2..eece60e5 100644
--- a/lib/screens/channel/video/video_store.dart
+++ b/lib/screens/channel/video/video_store.dart
@@ -97,6 +97,8 @@ abstract class VideoStoreBase with Store {
   /// Disposes the overlay reactions.
   late final ReactionDisposer _disposeOverlayReaction;
 
+  ReactionDisposer? _disposeAndroidAutoPipReaction;
+
   /// If the video is currently paused.
   ///
   /// Does not pause or play the video, only used for rendering state of the overlay.
@@ -148,13 +150,6 @@ abstract class VideoStoreBase with Store {
           .setMediaPlaybackRequiresUserGesture(false);
     }
 
-    // On Android, enable auto PiP mode (setAutoEnterEnabled) if the device supports it.
-    if (Platform.isAndroid) {
-      SimplePip.isAutoPipAvailable.then((isAutoPipAvailable) {
-        if (isAutoPipAvailable) pip.setAutoPipMode();
-      });
-    }
-
     // Initialize the [_overlayTimer] to hide the overlay automatically after 5 seconds.
     _overlayTimer =
         Timer(const Duration(seconds: 5), () => _overlayVisible = false);
@@ -165,6 +160,19 @@ abstract class VideoStoreBase with Store {
       (_) => videoWebViewController.loadRequest(Uri.parse(videoUrl)),
     );
 
+    // On Android, enable auto PiP mode (setAutoEnterEnabled) if the device supports it.
+    if (Platform.isAndroid) {
+      _disposeAndroidAutoPipReaction = autorun(
+        (_) async {
+          if (settingsStore.showVideo && await SimplePip.isAutoPipAvailable) {
+            pip.setAutoPipMode();
+          } else {
+            pip.setAutoPipMode(autoEnter: false);
+          }
+        },
+      );
+    }
+
     updateStreamInfo();
   }
 
@@ -361,5 +369,6 @@ abstract class VideoStoreBase with Store {
     }
 
     _disposeOverlayReaction();
+    _disposeAndroidAutoPipReaction?.call();
   }
 }