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 972af19f08..3f620fda46 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
@@ -314,11 +314,13 @@ public final class RecipientBottomSheetDialogFragment extends BottomSheetDialogF
     });
 
     viewModel.getIdentity().observe(getViewLifecycleOwner(), identityRecord -> {
-      viewSafetyNumberButton.setVisibility(View.VISIBLE);
-      viewSafetyNumberButton.setOnClickListener(view -> {
-        dismiss();
-        viewModel.onViewSafetyNumberClicked(requireActivity(), identityRecord);
-      });
+      if (identityRecord != null) {
+        viewSafetyNumberButton.setVisibility(View.VISIBLE);
+        viewSafetyNumberButton.setOnClickListener(view -> {
+          dismiss();
+          viewModel.onViewSafetyNumberClicked(requireActivity(), identityRecord);
+        });
+      }
     });
 
     avatar.setOnClickListener(view -> {