diff --git a/Signal/src/ViewControllers/MediaGallery/MediaDetailViewController.m b/Signal/src/ViewControllers/MediaGallery/MediaDetailViewController.m
index e13eeec1f9..df55e9cbec 100644
--- a/Signal/src/ViewControllers/MediaGallery/MediaDetailViewController.m
+++ b/Signal/src/ViewControllers/MediaGallery/MediaDetailViewController.m
@@ -117,7 +117,7 @@ NS_ASSUME_NONNULL_BEGIN
 {
     [super viewDidAppear:animated];
 
-    if (self.shouldAutoPlayVideo && !self.hasAutoPlayedVideo) {
+    if (self.isVideo && self.shouldAutoPlayVideo && !self.hasAutoPlayedVideo) {
 
         [self playVideo];
         self.hasAutoPlayedVideo = YES;