diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/individual/IndividualSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/individual/IndividualSettingsViewModel.kt
index c9de694850..5707cf1ee7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/individual/IndividualSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/individual/IndividualSettingsViewModel.kt
@@ -177,7 +177,9 @@ class IndividualSettingsViewModel(
         _actions.send(ConversationSettingsAction.AddContact(state.recipient))
       }
       IndividualSettingsEvent.ViewSafetyNumberClicked -> {
-        _actions.send(ConversationSettingsAction.ShowSafetyNumber(state.identityRecord))
+        val identityRecord = repository.getIdentity(recipientId)
+        _state.update { it.copy(identityRecord = identityRecord) }
+        _actions.send(ConversationSettingsAction.ShowSafetyNumber(identityRecord))
       }
       is IndividualSettingsEvent.SharedMediaClicked -> {
         _actions.send(sharedMediaClickAction(event.mediaRecord, event.isLtr))