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 1592e7646e..0ca63d52a7 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
@@ -46,7 +46,7 @@ class DatabaseSessionStore @Inject constructor(
                 } else {
                     LoggedInState.LoggedIn(
                         sessionId = it.userId,
-                        isTokenValid = (it.isTokenValid ?: 1) == 1L
+                        isTokenValid = it.isTokenValid == 1L
                     )
                 }
             }
diff --git a/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/SessionDataMapper.kt b/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/SessionDataMapper.kt
index 7c00d98f91..1a81647f5c 100644
--- a/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/SessionDataMapper.kt
+++ b/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/SessionDataMapper.kt
@@ -46,7 +46,7 @@ internal fun DbSessionData.toApiModel(): SessionData {
         oidcData = oidcData,
         slidingSyncProxy = slidingSyncProxy,
         loginTimestamp = loginTimestamp?.let { Date(it) },
-        isTokenValid = (isTokenValid ?: 1) == 1L,
+        isTokenValid = isTokenValid == 1L,
         loginType = LoginType.fromName(loginType ?: LoginType.UNKNOWN.name),
     )
 }
diff --git a/libraries/session-storage/impl/src/main/sqldelight/databases/4.db b/libraries/session-storage/impl/src/main/sqldelight/databases/4.db
new file mode 100644
index 0000000000..f2e7eb964f
Binary files /dev/null and b/libraries/session-storage/impl/src/main/sqldelight/databases/4.db differ
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 05049c5635..8cebfbe5e2 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
@@ -6,7 +6,9 @@ CREATE TABLE SessionData (
     homeserverUrl TEXT NOT NULL,
     slidingSyncProxy TEXT,
     loginTimestamp INTEGER,
-    oidcData TEXT
+    oidcData TEXT,
+    isTokenValid INTEGER NOT NULL,
+    loginType TEXT
 );
 
 
diff --git a/libraries/session-storage/impl/src/main/sqldelight/migrations/3.sqm b/libraries/session-storage/impl/src/main/sqldelight/migrations/3.sqm
new file mode 100644
index 0000000000..c4d0743ff5
--- /dev/null
+++ b/libraries/session-storage/impl/src/main/sqldelight/migrations/3.sqm
@@ -0,0 +1,2 @@
+ALTER TABLE SessionData ADD COLUMN isTokenValid INTEGER NOT NULL DEFAULT 1;
+ALTER TABLE SessionData ADD COLUMN loginType TEXT;
diff --git a/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTests.kt b/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTests.kt
index fbb1daf097..ab0b41194e 100644
--- a/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTests.kt
+++ b/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTests.kt
@@ -39,7 +39,7 @@ class DatabaseSessionStoreTests {
         slidingSyncProxy = null,
         loginTimestamp = null,
         oidcData = "aOidcData",
-        isTokenValid = null,
+        isTokenValid = 1,
         loginType = null,
     )
 
@@ -124,7 +124,7 @@ class DatabaseSessionStoreTests {
             slidingSyncProxy = "slidingSyncProxy",
             loginTimestamp = 1,
             oidcData = "aOidcData",
-            isTokenValid = null,
+            isTokenValid = 1,
             loginType = null,
         )
         val secondSessionData = SessionData(
@@ -136,7 +136,7 @@ class DatabaseSessionStoreTests {
             slidingSyncProxy = "slidingSyncProxyAltered",
             loginTimestamp = 2,
             oidcData = "aOidcDataAltered",
-            isTokenValid = null,
+            isTokenValid = 1,
             loginType = null,
         )
         assertThat(firstSessionData.userId).isEqualTo(secondSessionData.userId)