diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
index af7b353223..407539f247 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
@@ -143,7 +143,7 @@ public final class AvatarImageView extends AppCompatImageView {
         } else {
           getContext().startActivity(RecipientExporter.export(recipient).asAddContactIntent());
         }
-      } else {
+      } else if (listener != null) {
         listener.onClick(v);
       }
     });