diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index ed9620997d..4dab4651c6 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -1533,9 +1533,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void onSecurityUpdated() {
-    Log.i(TAG, "onSecurityUpdated()");
-    updateReminders(recipient.hasSeenInviteReminder());
-    updateDefaultSubscriptionId(recipient.getDefaultSubscriptionId());
+    if (recipient != null) {
+      updateDefaultSubscriptionId(recipient.getDefaultSubscriptionId());
+    }
   }
 
   protected void updateReminders(boolean seenInvite) {