diff --git a/features/migration/impl/build.gradle.kts b/features/migration/impl/build.gradle.kts
index 6978975070..69a1c2bfe9 100644
--- a/features/migration/impl/build.gradle.kts
+++ b/features/migration/impl/build.gradle.kts
@@ -40,6 +40,7 @@ dependencies {
     testImplementation(libs.test.robolectric)
     testImplementation(libs.test.truth)
     testImplementation(libs.test.turbine)
+    testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.sessionStorage.implMemory)
     testImplementation(projects.libraries.sessionStorage.test)
     testImplementation(projects.libraries.preferences.test)
diff --git a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration05Test.kt b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration05Test.kt
new file mode 100644
index 0000000000..dd2e969364
--- /dev/null
+++ b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration05Test.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.migration.impl.migrations
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.libraries.sessionstorage.impl.memory.InMemorySessionStore
+import io.element.android.libraries.sessionstorage.test.aSessionData
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import java.io.File
+
+class AppMigration05Test {
+    @Test
+    fun `empty session path should be set to an expected path`() = runTest {
+        val sessionStore = InMemorySessionStore().apply {
+            updateData(
+                aSessionData(
+                    sessionId = A_SESSION_ID,
+                    sessionPath = "",
+                )
+            )
+        }
+        val migration = AppMigration05(sessionStore = sessionStore, baseDirectory = File("/a/path"))
+        migration.migrate()
+        val storedData = sessionStore.getSession(A_SESSION_ID.value)!!
+        assertThat(storedData.sessionPath).isEqualTo("/a/path/${A_SESSION_ID.value.replace(':', '_')}")
+    }
+
+    @Test
+    fun `non empty session path should not be impacted by the migration`() = runTest {
+        val sessionStore = InMemorySessionStore().apply {
+            updateData(
+                aSessionData(
+                    sessionId = A_SESSION_ID,
+                    sessionPath = "/a/path/existing",
+                )
+            )
+        }
+        val migration = AppMigration05(sessionStore = sessionStore, baseDirectory = File("/a/path"))
+        migration.migrate()
+        val storedData = sessionStore.getSession(A_SESSION_ID.value)!!
+        assertThat(storedData.sessionPath).isEqualTo("/a/path/existing")
+    }
+}
diff --git a/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/SessionData.kt b/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/SessionData.kt
index c33ab78d61..d128d03507 100644
--- a/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/SessionData.kt
+++ b/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/SessionData.kt
@@ -23,6 +23,7 @@ import io.element.android.libraries.sessionstorage.api.SessionData
 fun aSessionData(
     sessionId: SessionId = SessionId("@alice:server.org"),
     isTokenValid: Boolean = false,
+    sessionPath: String = "/a/path/to/a/session",
 ): SessionData {
     return SessionData(
         userId = sessionId.value,
@@ -36,7 +37,7 @@ fun aSessionData(
         isTokenValid = isTokenValid,
         loginType = LoginType.UNKNOWN,
         passphrase = null,
-        sessionPath = "/a/path/to/a/session",
+        sessionPath = sessionPath,
         cachePath = "/a/path/to/a/cache",
     )
 }