diff --git a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
index 781f3f8cb6..696a8c69cb 100644
--- a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
@@ -59,9 +59,9 @@ class SharedPreferencesUiStateRepository @Inject constructor(
         }
     }
 
-    override fun storeSelectedSpace(roomId: String?, sessionId: String) {
+    override fun storeSelectedSpace(spaceId: String?, sessionId: String) {
         sharedPreferences.edit {
-            putString("$KEY_SELECTED_SPACE@$sessionId", roomId)
+            putString("$KEY_SELECTED_SPACE@$sessionId", spaceId)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
index e247b2f1d1..25e81efa83 100644
--- a/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
@@ -32,7 +32,7 @@ interface UiStateRepository {
 
     fun storeDisplayMode(displayMode: RoomListDisplayMode)
 
-    fun storeSelectedSpace(roomId: String?, sessionId: String)
+    fun storeSelectedSpace(spaceId: String?, sessionId: String)
 
     fun getSelectedSpace(sessionId: String): String?
 }