diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index 9bc45de62..8b4d1841f 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -449,7 +449,10 @@ public class ConversationListFragment extends Fragment
     getListAdapter().initializeBatchMode(true);
     getListAdapter().toggleThreadInBatchSet(item.getChatId());
     getListAdapter().notifyDataSetChanged();
-    updateActionModeItems(actionMode.getMenu());
+    Menu menu = actionMode.getMenu();
+    if (menu != null) {
+        updateActionModeItems(menu);
+    }
   }
 
   @Override