diff --git a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
index bdad3c2ab0..0332f34306 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
@@ -349,7 +349,7 @@ class RootFlowNode(
         } else {
             // wait for the current session to be restored
             val loggedInFlowNode = attachSession(latestSessionId)
-            if (sessionStore.getAllSessions().size > 1) {
+            if (sessionStore.numberOfSessions() > 1) {
                 // Several accounts, let the user choose which one to use
                 backstack.push(
                     NavTarget.AccountSelect(
@@ -379,7 +379,7 @@ class RootFlowNode(
                 is PermalinkData.FallbackLink -> Unit
                 is PermalinkData.RoomEmailInviteLink -> Unit
                 else -> {
-                    if (sessionStore.getAllSessions().size > 1) {
+                    if (sessionStore.numberOfSessions() > 1) {
                         // Several accounts, let the user choose which one to use
                         backstack.push(
                             NavTarget.AccountSelect(
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt
index e7e20aa70d..44d8095fa3 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt
@@ -90,7 +90,7 @@ class OnBoardingPresenter(
         }
         val isAddingAccount by produceState(initialValue = false) {
             // We are adding an account if there is at least one session already stored
-            value = sessionStore.getAllSessions().isNotEmpty()
+            value = sessionStore.numberOfSessions() > 0
         }
 
         val loginMode by loginHelper.collectLoginMode()
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
index 89bec00ac5..7f173a8fe1 100755
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
@@ -165,7 +165,7 @@ class DefaultBugReporter(
                     }
                 }
                 val sessionData = sessionStore.getLatestSession()
-                val numberOfAccounts = sessionStore.getAllSessions().size
+                val numberOfAccounts = sessionStore.numberOfSessions()
                 val deviceId = sessionData?.deviceId ?: "undefined"
                 val userId = sessionData?.userId?.let { UserId(it) }
                 // build the multi part request
diff --git a/features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/SignedOutPresenterTest.kt b/features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/SignedOutPresenterTest.kt
index e53c0af112..d5a9a910a0 100644
--- a/features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/SignedOutPresenterTest.kt
+++ b/features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/SignedOutPresenterTest.kt
@@ -58,9 +58,11 @@ class SignedOutPresenterTest {
             val initialState = awaitItem()
             assertThat(initialState.signedOutSession).isEqualTo(aSessionData)
             assertThat(sessionStore.getAllSessions()).isNotEmpty()
+            assertThat(sessionStore.numberOfSessions()).isEqualTo(1)
             initialState.eventSink(SignedOutEvents.SignInAgain)
             assertThat(awaitItem().signedOutSession).isNull()
             assertThat(sessionStore.getAllSessions()).isEmpty()
+            assertThat(sessionStore.numberOfSessions()).isEqualTo(0)
         }
     }
 }
diff --git a/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionStore.kt b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionStore.kt
index 7900b4d90d..f3b66d73c0 100644
--- a/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionStore.kt
+++ b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionStore.kt
@@ -50,6 +50,11 @@ interface SessionStore {
      */
     suspend fun getAllSessions(): List<SessionData>
 
+    /**
+     * Get the number of sessions.
+     */
+    suspend fun numberOfSessions(): Int
+
     /**
      * Get the latest session, or null if no session exists.
      */
diff --git a/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStore.kt b/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStore.kt
index 0560d3076a..81353f5305 100644
--- a/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStore.kt
+++ b/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStore.kt
@@ -161,6 +161,15 @@ class DatabaseSessionStore(
         }
     }
 
+    override suspend fun numberOfSessions(): Int {
+        return sessionDataMutex.withLock {
+            database.sessionDataQueries.count()
+                .executeAsOneOrNull()
+                ?.toInt()
+                ?: 0
+        }
+    }
+
     override fun sessionsFlow(): Flow<List<SessionData>> {
         return database.sessionDataQueries.selectAll()
             .asFlow()
diff --git a/libraries/session-storage/impl/src/main/sqldelight/io/element/android/libraries/matrix/session/SessionData.sq b/libraries/session-storage/impl/src/main/sqldelight/io/element/android/libraries/matrix/session/SessionData.sq
index 53d07bfba3..b61c746fb8 100644
--- a/libraries/session-storage/impl/src/main/sqldelight/io/element/android/libraries/matrix/session/SessionData.sq
+++ b/libraries/session-storage/impl/src/main/sqldelight/io/element/android/libraries/matrix/session/SessionData.sq
@@ -47,6 +47,9 @@ SELECT * FROM SessionData ORDER BY lastUsageIndex DESC LIMIT 1;
 selectAll:
 SELECT * FROM SessionData ORDER BY lastUsageIndex DESC;
 
+count:
+SELECT count(*) FROM SessionData;
+
 selectByUserId:
 SELECT * FROM SessionData WHERE userId = ?;
 
diff --git a/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTest.kt b/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTest.kt
index d1fef8a39a..f28d9e21df 100644
--- a/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTest.kt
+++ b/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTest.kt
@@ -52,6 +52,7 @@ class DatabaseSessionStoreTest {
 
         assertThat(database.sessionDataQueries.selectLatest().executeAsOneOrNull()).isEqualTo(aSessionData)
         assertThat(database.sessionDataQueries.selectAll().executeAsList().size).isEqualTo(1)
+        assertThat(database.sessionDataQueries.count().executeAsOneOrNull()).isEqualTo(1)
     }
 
     @Test
@@ -109,6 +110,7 @@ class DatabaseSessionStoreTest {
 
         assertThat(foundSession).isEqualTo(aSessionData)
         assertThat(database.sessionDataQueries.selectAll().executeAsList().size).isEqualTo(2)
+        assertThat(database.sessionDataQueries.count().executeAsOneOrNull()).isEqualTo(2)
     }
 
     @Test
@@ -196,12 +198,16 @@ class DatabaseSessionStoreTest {
                 position = 1,
                 lastUsageIndex = 1,
             )
+            assertThat(database.sessionDataQueries.count().executeAsOneOrNull()).isEqualTo(1)
             databaseSessionStore.addSession(secondSessionData.toApiModel())
             assertThat(awaitItem().size).isEqualTo(2)
+            assertThat(database.sessionDataQueries.count().executeAsOneOrNull()).isEqualTo(2)
             databaseSessionStore.removeSession(aSessionData.userId)
             assertThat(awaitItem().size).isEqualTo(1)
+            assertThat(database.sessionDataQueries.count().executeAsOneOrNull()).isEqualTo(1)
             databaseSessionStore.removeSession(secondSessionData.userId)
             assertThat(awaitItem()).isEmpty()
+            assertThat(database.sessionDataQueries.count().executeAsOneOrNull()).isEqualTo(0)
         }
     }
 
diff --git a/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/InMemorySessionStore.kt b/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/InMemorySessionStore.kt
index c8f3078e7a..00dd9ad9c0 100644
--- a/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/InMemorySessionStore.kt
+++ b/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/InMemorySessionStore.kt
@@ -67,6 +67,10 @@ class InMemorySessionStore(
         return sessionDataListFlow.value
     }
 
+    override suspend fun numberOfSessions(): Int {
+        return sessionDataListFlow.value.size
+    }
+
     override suspend fun getLatestSession(): SessionData? {
         return sessionDataListFlow.value.firstOrNull()
     }