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 9df7f0356a..2ca8fcc0ff 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -763,7 +763,11 @@ public class ConversationListFragment extends MainFragment implements ActionMode
       db.pinConversations(toPin);
 
       return null;
-    }, unused -> actionMode.finish());
+    }, unused -> {
+      if (actionMode != null) {
+        actionMode.finish();
+      }
+    });
   }
 
   private void handleUnpinAllSelected() {
@@ -775,7 +779,11 @@ public class ConversationListFragment extends MainFragment implements ActionMode
       db.unpinConversations(toPin);
 
       return null;
-    }, unused -> actionMode.finish());
+    }, unused -> {
+      if (actionMode != null) {
+        actionMode.finish();
+      }
+    });
   }
 
   private void handleSelectAllThreads() {