diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 9cdb76cf25..485fcaca5f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -851,8 +851,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                     binding.messageRequestBar.visibility = View.GONE
                 }
                 if (!uiState.conversationExists && !isFinishing) {
-                    // Conversation should be deleted now, go to homepage with a cleared stack
-                    baseContext.startHomeActivity(isFromOnboarding = false, isNewAccount = false)
+                    // Conversation should be deleted now
+                    finish()
                 }
 
                 // show or hide the text input
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
index 5a19263cac..cfbd03bb57 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
@@ -372,6 +372,11 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
             binding.seedReminderView.isVisible = false
         }
 
+        // refresh search on resume, in case we a conversation was deleted
+        if (binding.globalSearchRecycler.isVisible){
+            globalSearchViewModel.refresh()
+        }
+
         updateLegacyConfigView()
 
         // Sync config changes if there are any