diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt
index 1e7444f498..b92dfb2bc9 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt
@@ -55,6 +55,7 @@ fun aSpaceState(
     children: List<SpaceRoom> = emptyList(),
     seenSpaceInvites: Set<RoomId> = emptySet(),
     joiningRooms: Set<RoomId> = emptySet(),
+    joinActions: Map<RoomId, AsyncAction<Unit>> = joiningRooms.associateWith { AsyncAction.Loading },
     hideInvitesAvatar: Boolean = false,
     hasMoreToLoad: Boolean = false,
     acceptDeclineInviteState: AcceptDeclineInviteState = anAcceptDeclineInviteState(),
@@ -64,7 +65,7 @@ fun aSpaceState(
     seenSpaceInvites = seenSpaceInvites.toImmutableSet(),
     hideInvitesAvatar = hideInvitesAvatar,
     hasMoreToLoad = hasMoreToLoad,
-    joinActions = joiningRooms.associateWith { AsyncAction.Loading }.toImmutableMap(),
+    joinActions = joinActions.toImmutableMap(),
     acceptDeclineInviteState = acceptDeclineInviteState,
     eventSink = {}
 )
diff --git a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceStateTest.kt b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceStateTest.kt
new file mode 100644
index 0000000000..d036d7023c
--- /dev/null
+++ b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceStateTest.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.space.impl.root
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.matrix.test.AN_EXCEPTION
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_ROOM_ID_2
+import io.element.android.libraries.matrix.test.A_ROOM_ID_3
+import org.junit.Test
+
+class SpaceStateTest {
+    @Test
+    fun `test default state`() {
+        val state = aSpaceState()
+        assertThat(state.hasAnyFailure).isFalse()
+        assertThat(state.isJoining(A_ROOM_ID)).isFalse()
+    }
+
+    @Test
+    fun `test has failure`() {
+        val state = aSpaceState(
+            joinActions = mapOf(
+                A_ROOM_ID to AsyncAction.Uninitialized,
+                A_ROOM_ID_2 to AsyncAction.Failure(AN_EXCEPTION),
+                A_ROOM_ID_3 to AsyncAction.Success(Unit),
+            )
+        )
+        assertThat(state.hasAnyFailure).isTrue()
+    }
+
+    @Test
+    fun `test isJoining`() {
+        val state = aSpaceState(
+            joinActions = mapOf(
+                A_ROOM_ID to AsyncAction.Loading,
+            )
+        )
+        assertThat(state.isJoining(A_ROOM_ID)).isTrue()
+    }
+}