diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
index 1bfd19274c..2f22edeafe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
@@ -96,6 +96,11 @@ class ConversationViewModel(
     init {
         viewModelScope.launch(Dispatchers.IO) {
             repository.recipientUpdateFlow(threadId)
+                    .collect { recipient ->
+                        if (recipient == null && _uiState.value.conversationExists) {
+                            _uiState.update { it.copy(conversationExists = false) }
+                        }
+                    }
         }
     }