diff --git a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
index 7fbc528ce68..1e16f0d749f 100644
--- a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
+++ b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
@@ -194,9 +194,10 @@ private void initializeToolbar() {
       () -> DatabaseFactory.getThreadDatabase(this).getThreadIdFor(recipientId),
       (threadId) -> {
         if (threadId == null) {
-          throw new AssertionError();
+          Log.i(TAG, "No thread id for recipient.");
+        } else {
+          this.threadPhotoRailLabel.setOnClickListener(v -> startActivity(MediaOverviewActivity.forThread(this, threadId)));
         }
-        this.threadPhotoRailLabel.setOnClickListener(v -> startActivity(MediaOverviewActivity.forThread(this, threadId)));
       }
     );