diff --git a/src/org/thoughtcrime/securesms/components/AudioView.java b/src/org/thoughtcrime/securesms/components/AudioView.java
index faa28ba759..55bfd52c83 100644
--- a/src/org/thoughtcrime/securesms/components/AudioView.java
+++ b/src/org/thoughtcrime/securesms/components/AudioView.java
@@ -131,6 +131,11 @@ public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener
   @Override
   public void onStop() {
     this.controlToggle.display(this.playButton);
+
+    if (seekBar.getProgress() + 5 >= seekBar.getMax()) {
+      backwardsCounter = 4;
+      onProgress(0.0, 0);
+    }
   }
 
   @Override