diff --git a/Packages/MediaUI/Sources/MediaUI/MediaUIAttachmentVideoView.swift b/Packages/MediaUI/Sources/MediaUI/MediaUIAttachmentVideoView.swift
index 85c9021f..a7e12ac9 100644
--- a/Packages/MediaUI/Sources/MediaUI/MediaUIAttachmentVideoView.swift
+++ b/Packages/MediaUI/Sources/MediaUI/MediaUIAttachmentVideoView.swift
@@ -80,6 +80,10 @@ public struct MediaUIAttachmentVideoView: View {
       viewModel.pause()
     }
     .onTapGesture {
+      if !preferences.autoPlayVideo && !viewModel.isPlaying {
+        viewModel.play()
+        return
+      }
       isFullScreen = true
     }
     .fullScreenCover(isPresented: $isFullScreen) {
@@ -93,6 +97,16 @@ public struct MediaUIAttachmentVideoView: View {
             }
           }
       }
+      .onAppear {
+        if isCompact || !preferences.autoPlayVideo {
+          viewModel.play()
+        }
+      }
+      .onDisappear {
+        if isCompact || !preferences.autoPlayVideo {
+          viewModel.pause()
+        }
+      }
     }
     .cornerRadius(4)
     .onChange(of: scenePhase) { _, newValue in