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 b634b55fe8..313f9f4db2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
@@ -292,6 +292,10 @@ public final class AvatarImageView extends AppCompatImageView {
   }
 
   public void disableQuickContact() {
+    if (listener == null && !isClickable() && !hasOnClickListeners()) {
+      return;
+    }
+
     super.setOnClickListener(listener);
     setClickable(listener != null);
   }