diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index b62a7cb799..6cbc25d1a5 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -779,7 +779,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void initializeSecurity(final boolean current) {
-    handleSecurityChange(current);
+    handleSecurityChange(current || isGroupConversation());
 
     new AsyncTask<Recipients, Void, Boolean>() {
       @Override