diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index bcfd4f8a4..6e28121b4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -1568,7 +1568,13 @@ public class ConversationListFragment extends MainFragment implements ActionMode
       super.clearView(recyclerView, viewHolder);
       ViewCompat.setElevation(viewHolder.itemView, 0);
       lastTouched = null;
-      itemAnimator.postDisable(requireView().getHandler());
+
+      View view = getView();
+      if (view != null) {
+        itemAnimator.postDisable(view.getHandler());
+      } else {
+        itemAnimator.disable();
+      }
     }
   }