diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt
index d295784a8c..4a2c84e258 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt
@@ -19,7 +19,7 @@ package im.vector.app.features.home.room.detail.search
 import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class SearchAction : VectorViewModelAction {
-    data class SearchWith(val roomId: String, val searchTerm: String) : SearchAction()
+    data class SearchWith(val searchTerm: String) : SearchAction()
     object ScrolledToTop : SearchAction()
     object Retry : SearchAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
index fa60d33e64..360a6b6fcc 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
@@ -123,7 +123,7 @@ class SearchFragment @Inject constructor(
 
     fun search(query: String) {
         view?.hideKeyboard()
-        searchViewModel.handle(SearchAction.SearchWith(fragmentArgs.roomId, query))
+        searchViewModel.handle(SearchAction.SearchWith(query))
     }
 
     override fun onRetryClicked() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
index 67befc80be..5747e83cad 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
@@ -57,7 +57,7 @@ class SearchViewModel @AssistedInject constructor(
     private fun handleSearchWith(action: SearchAction.SearchWith) {
         if (action.searchTerm.length > 1) {
             setState {
-                copy(searchTerm = action.searchTerm, roomId = action.roomId, isNextBatch = false)
+                copy(searchTerm = action.searchTerm, isNextBatch = false)
             }
 
             startSearching()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
index 02db098e68..8c2eb82ad1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
@@ -27,4 +27,7 @@ data class SearchViewState(
         val searchTerm: String? = null,
         val roomId: String? = null,
         val isNextBatch: Boolean = false
-) : MvRxState
+) : MvRxState {
+
+    constructor(args: SearchArgs) : this(roomId = args.roomId)
+}