diff --git a/Signal/src/ViewControllers/MediaDetailViewController.m b/Signal/src/ViewControllers/MediaDetailViewController.m
index 8f196f1b0..67578ce1e 100644
--- a/Signal/src/ViewControllers/MediaDetailViewController.m
+++ b/Signal/src/ViewControllers/MediaDetailViewController.m
@@ -79,6 +79,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @implementation MediaDetailViewController
 
+- (void)dealloc
+{
+    [self stopVideo];
+}
+
 - (instancetype)initWithGalleryItemBox:(GalleryItemBox *)galleryItemBox
                               viewItem:(ConversationViewItem *_Nullable)viewItem
 {
diff --git a/Signal/src/ViewControllers/MediaPageViewController.swift b/Signal/src/ViewControllers/MediaPageViewController.swift
index 29e584338..2dcd324e3 100644
--- a/Signal/src/ViewControllers/MediaPageViewController.swift
+++ b/Signal/src/ViewControllers/MediaPageViewController.swift
@@ -8,11 +8,11 @@ import UIKit
 @objc
 public class GalleryItemBox: NSObject {
     public let value: MediaGalleryItem
-    
+
     init(_ value: MediaGalleryItem) {
         self.value = value
     }
-    
+
     public var attachmentStream: TSAttachmentStream {
         return value.attachmentStream
     }
@@ -190,6 +190,8 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
     public func didPressAllMediaButton(sender: Any) {
         Logger.debug("\(logTag) in \(#function)")
 
+        currentViewController.stopVideo()
+
         guard let mediaGalleryDataSource = self.mediaGalleryDataSource else {
             owsFail("\(logTag) in \(#function) mediaGalleryDataSource was unexpectedly nil")
             return