diff --git a/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift b/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
index 6007bdff9..9c6bf7340 100644
--- a/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
+++ b/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
@@ -98,21 +98,20 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
             .weakAssign(to: \.state.selectedRoomID, on: self)
             .store(in: &cancellables)
         
-        context.$viewState
-            .map(\.bindings.searchQuery)
-            .removeDuplicates()
-            .sink { [weak self] searchQuery in
+        let isSearchFieldFocused = context.$viewState.map(\.bindings.isSearchFieldFocused)
+        let searchQuery = context.$viewState.map(\.bindings.searchQuery)
+        isSearchFieldFocused
+            .combineLatest(searchQuery)
+            .removeDuplicates { $0 == $1 }
+            .map { _ in () }
+            .sink { [weak self] in
                 guard let self else { return }
-                updateFilter(isSearchFieldFocused: state.bindings.isSearchFieldFocused, searchQuery: searchQuery)
-            }
-            .store(in: &cancellables)
-        
-        context.$viewState
-            .map(\.bindings.isSearchFieldFocused)
-            .removeDuplicates()
-            .sink { [weak self] isSearchFieldFocused in
-                guard let self else { return }
-                updateFilter(isSearchFieldFocused: isSearchFieldFocused, searchQuery: state.bindings.searchQuery)
+                // Don't capture the values here as combine behaves incorrectly and `isSearchFieldFocused` is sometimes
+                // turning to true after cancelling the search. Read them directly from the state in the updateFilter
+                // method instead on the next run loop to make sure they're up to date.
+                DispatchQueue.main.async {
+                    self.updateFilter()
+                }
             }
             .store(in: &cancellables)
         
@@ -170,13 +169,13 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
     
     // MARK: - Private
     
-    private func updateFilter(isSearchFieldFocused: Bool, searchQuery: String) {
-        if !isSearchFieldFocused {
+    private func updateFilter() {
+        if !state.bindings.isSearchFieldFocused {
             roomSummaryProvider?.setFilter(.all)
-        } else if searchQuery.isEmpty {
+        } else if state.bindings.searchQuery.isEmpty {
             roomSummaryProvider?.setFilter(.none)
         } else {
-            roomSummaryProvider?.setFilter(.normalizedMatchRoomName(searchQuery))
+            roomSummaryProvider?.setFilter(.normalizedMatchRoomName(state.bindings.searchQuery))
         }
     }
     
diff --git a/changelog.d/2040.bugfix b/changelog.d/2040.bugfix
new file mode 100644
index 000000000..72b6c1992
--- /dev/null
+++ b/changelog.d/2040.bugfix
@@ -0,0 +1 @@
+Prevent the room list from staying empty after cancelling a search
\ No newline at end of file