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 edf6e1cc32..f2b44eada4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
@@ -93,6 +93,15 @@ public class VideoPlayer extends FrameLayout {
 
     this.exoPlayerListener = new ExoPlayerListener();
     this.playerListener    = new Player.Listener() {
+
+      @Override
+      public void onIsPlayingChanged(boolean isPlaying) {
+        if (!isPlaying && exoPlayer.getCurrentPosition() >= exoPlayer.getDuration()) {
+          exoPlayer.seekTo(0);
+          exoPlayer.setPlayWhenReady(false);
+        }
+      }
+
       @Override
       public void onPlayWhenReadyChanged(boolean playWhenReady, int reason) {
         onPlaybackStateChanged(playWhenReady, exoPlayer.getPlaybackState());