diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
index 7e4f3a4e01..2e67becbfd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -565,8 +565,12 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
     public void onPageUnselected(int position) {
       if (adapter == null) return;
 
-      MediaItem item = adapter.getMediaItemFor(position);
-      if (item.recipient != null) item.recipient.removeListener(MediaPreviewActivity.this);
+      try {
+        MediaItem item = adapter.getMediaItemFor(position);
+        if (item.recipient != null) item.recipient.removeListener(MediaPreviewActivity.this);
+      } catch (CursorIndexOutOfBoundsException e) {
+        throw new RuntimeException("position = " + position + " leftIsRecent = " + leftIsRecent, e);
+      }
 
       adapter.pause(position);
     }