diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
index f604d82d6a..a1635bffc1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -1258,6 +1258,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
 
     contactPhoto.setAvatar(glideRequests, recipient, false);
     badgeImageView.setBadgeFromRecipient(recipient, glideRequests);
+    badgeImageView.setClickable(false);
   }
 
   private void linkifyMessageBody(@NonNull Spannable messageBody,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
index ce665478c8..fc24c6da62 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
@@ -226,6 +226,7 @@ public final class ConversationListItem extends ConstraintLayout
   private void setBadgeFromRecipient(Recipient recipient) {
     if (!recipient.isSelf()) {
       badge.setBadgeFromRecipient(recipient);
+      badge.setClickable(false);
     } else {
       badge.setBadge(null);
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java
index 4538708cd9..65a35ddea5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java
@@ -202,7 +202,6 @@ final class GroupMemberListAdapter extends RecyclerView.Adapter<GroupMemberListA
               final LifecycleOwner             lifecycleOwner;
               final Observer<Boolean>          busyObserver;
 
-    Runnable startListeningToBusyChanges;
     Runnable stopListeningToBusyChanges;
 
     ViewHolder(@NonNull View itemView,
@@ -257,6 +256,7 @@ final class GroupMemberListAdapter extends RecyclerView.Adapter<GroupMemberListA
 
       if (this.badge != null) {
         this.badge.setBadgeFromRecipient(recipient);
+        this.badge.setClickable(false);
       }
 
       if (this.about != null) {