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()
     }