diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0aa2f926c7e..1d619830873 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -40,7 +40,7 @@ serialization_json = "1.8.1"
 coil = "3.1.0"
 showkase = "1.0.3"
 appyx = "1.7.0"
-sqldelight = "2.0.2"
+sqldelight = "2.1.0"
 wysiwyg = "2.38.3"
 telephoto = "0.15.1"
 
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 95d3f501e46..d65fa5da90c 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
@@ -48,25 +48,29 @@ class DatabaseSessionStore @Inject constructor(
             }
     }
 
-    override suspend fun storeData(sessionData: SessionData) = sessionDataMutex.withLock {
-        database.sessionDataQueries.insertSessionData(sessionData.toDbModel())
+    override suspend fun storeData(sessionData: SessionData) {
+        sessionDataMutex.withLock {
+            database.sessionDataQueries.insertSessionData(sessionData.toDbModel())
+        }
     }
 
-    override suspend fun updateData(sessionData: SessionData) = sessionDataMutex.withLock {
-        val result = database.sessionDataQueries.selectByUserId(sessionData.userId)
-            .executeAsOneOrNull()
-            ?.toApiModel()
+    override suspend fun updateData(sessionData: SessionData) {
+        sessionDataMutex.withLock {
+            val result = database.sessionDataQueries.selectByUserId(sessionData.userId)
+                .executeAsOneOrNull()
+                ?.toApiModel()
 
-        if (result == null) {
-            Timber.e("User ${sessionData.userId} not found in session database")
-            return
-        }
+            if (result == null) {
+                Timber.e("User ${sessionData.userId} not found in session database")
+                return
+            }
             // Copy new data from SDK, but keep login timestamp
-        database.sessionDataQueries.updateSession(
-            sessionData.copy(
-                loginTimestamp = result.loginTimestamp,
-            ).toDbModel()
-        )
+            database.sessionDataQueries.updateSession(
+                sessionData.copy(
+                    loginTimestamp = result.loginTimestamp,
+                ).toDbModel()
+            )
+        }
     }
 
     override suspend fun getLatestSession(): SessionData? {