diff --git a/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java b/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
index 0267369429..5f8305ba92 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
@@ -234,6 +234,8 @@ public class VideoPlayer extends FrameLayout {
   }
 
   public void cleanup() {
+    stop();
+
     if (this.exoPlayer != null) {
       exoView.setPlayer(null);
       exoControls.setPlayer(null);