diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
index f29edd2b475..5699d8f8f96 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
@@ -148,6 +148,8 @@ public void onViewCreated(@NonNull View fragmentView, @Nullable Bundle savedInst
           startActivityForResult(RecipientExporter.export(recipient).asAddContactIntent(), REQUEST_CODE_ADD_CONTACT);
         });
       }
+
+      addToGroupButton.setVisibility(recipient.isRegistered() && !recipient.isGroup() ? View.VISIBLE : View.GONE);
     });
 
     viewModel.getAdminActionStatus().observe(getViewLifecycleOwner(), adminStatus -> {
diff --git a/app/src/main/res/layout/recipient_bottom_sheet.xml b/app/src/main/res/layout/recipient_bottom_sheet.xml
index 6627bd910ef..6d017a2533a 100644
--- a/app/src/main/res/layout/recipient_bottom_sheet.xml
+++ b/app/src/main/res/layout/recipient_bottom_sheet.xml
@@ -127,7 +127,9 @@
             android:paddingStart="20dp"
             android:paddingEnd="20dp"
             android:text="@string/RecipientBottomSheet_add_to_a_group"
-            app:drawableStartCompat="?attr/recipient_make_admin_icon" />
+            android:visibility="gone"
+            app:drawableStartCompat="?attr/recipient_make_admin_icon"
+            tools:visibility="visible" />
 
         <Button
             android:id="@+id/rbs_view_safety_number_button"