diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 663f2cdfa0..77d2e3deb2 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -816,7 +816,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void updateInviteReminder() {
-    if (TextSecurePreferences.isPushRegistered(this) && !isSecureText && recipients.isSingleRecipient()) {
+    if (TextSecurePreferences.isPushRegistered(this) &&
+        !isSecureText                                &&
+        recipients.isSingleRecipient()               &&
+        recipients.getPrimaryRecipient() != null     &&
+        recipients.getPrimaryRecipient().getContactUri() != null)
+    {
       new ShowInviteReminderTask().execute(recipients);
     } else {
       reminderView.hide();