diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java
index 05e59c23dc..f663d81f0c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java
@@ -211,9 +211,11 @@ public final class MediaOverviewPageFragment extends Fragment
   @Override
   public void onDestroy() {
     super.onDestroy();
-    int childCount = recyclerView.getChildCount();
-    for (int i = 0; i < childCount; i++) {
-      adapter.detach(recyclerView.getChildViewHolder(recyclerView.getChildAt(i)));
+    if (recyclerView != null) {
+      int childCount = recyclerView.getChildCount();
+      for (int i = 0; i < childCount; i++) {
+        adapter.detach(recyclerView.getChildViewHolder(recyclerView.getChildAt(i)));
+      }
     }
   }