diff --git a/src/org/thoughtcrime/securesms/components/AvatarImageView.java b/src/org/thoughtcrime/securesms/components/AvatarImageView.java
index c64a3a399a..af7b353223 100644
--- a/src/org/thoughtcrime/securesms/components/AvatarImageView.java
+++ b/src/org/thoughtcrime/securesms/components/AvatarImageView.java
@@ -136,17 +136,17 @@ public final class AvatarImageView extends AppCompatImageView {
   }
 
   private void setAvatarClickHandler(final Recipient recipient, boolean quickContactEnabled) {
-    if (!recipient.isGroup() && quickContactEnabled) {
-      super.setOnClickListener(v -> {
+    super.setOnClickListener(v -> {
+      if (!recipient.isGroup() && quickContactEnabled) {
         if (recipient.getContactUri() != null) {
           ContactsContract.QuickContact.showQuickContact(getContext(), AvatarImageView.this, recipient.getContactUri(), ContactsContract.QuickContact.MODE_LARGE, null);
         } else {
           getContext().startActivity(RecipientExporter.export(recipient).asAddContactIntent());
         }
-      });
-    } else {
-      super.setOnClickListener(listener);
-    }
+      } else {
+        listener.onClick(v);
+      }
+    });
   }
 
   private static class RecipientContactPhoto {