diff --git a/libraries/session-storage/impl/src/main/sqldelight/databases/1.db b/libraries/session-storage/impl/src/main/sqldelight/databases/1.db
new file mode 100644
index 0000000000..24a9b98f93
Binary files /dev/null and b/libraries/session-storage/impl/src/main/sqldelight/databases/1.db differ
diff --git a/libraries/session-storage/impl/src/main/sqldelight/databases/2.db b/libraries/session-storage/impl/src/main/sqldelight/databases/2.db
new file mode 100644
index 0000000000..8d5a4188bd
Binary files /dev/null and b/libraries/session-storage/impl/src/main/sqldelight/databases/2.db differ
diff --git a/libraries/session-storage/impl/src/main/sqldelight/databases/4.db b/libraries/session-storage/impl/src/main/sqldelight/databases/4.db
index f2e7eb964f..f51605ff2a 100644
Binary files a/libraries/session-storage/impl/src/main/sqldelight/databases/4.db 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 8cebfbe5e2..d6d16cb6e2 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
@@ -1,3 +1,13 @@
+--------------------------------------------------------------------
+-- Current version of the DB is the highest value of filename
+-- in the folder `sqldelight/databases`.
+--
+-- When upgrading the schema, you have to create a file .sqm in the
+-- `sqldelight/databases` folder and run the following task to
+-- generate a .db file using the latest schema
+-- > ./gradlew generateDebugSessionDatabaseSchema
+--------------------------------------------------------------------
+
 CREATE TABLE SessionData (
     userId TEXT NOT NULL PRIMARY KEY,
     deviceId TEXT NOT NULL,
@@ -5,9 +15,12 @@ CREATE TABLE SessionData (
     refreshToken TEXT,
     homeserverUrl TEXT NOT NULL,
     slidingSyncProxy TEXT,
+    -- added in version 2
     loginTimestamp INTEGER,
+    -- added in version 3
     oidcData TEXT,
-    isTokenValid INTEGER NOT NULL,
+    -- added in version 4
+    isTokenValid INTEGER NOT NULL DEFAULT 1,
     loginType TEXT
 );
 
diff --git a/libraries/session-storage/impl/src/main/sqldelight/migrations/0.sqm b/libraries/session-storage/impl/src/main/sqldelight/migrations/0.sqm
index 396a8f28dd..4577105e3d 100644
--- a/libraries/session-storage/impl/src/main/sqldelight/migrations/0.sqm
+++ b/libraries/session-storage/impl/src/main/sqldelight/migrations/0.sqm
@@ -1,3 +1,6 @@
+-- This file is not striclty necessary, since the first
+-- version of the DB is 1, so we will never migrate from 0
+
 CREATE TABLE SessionData (
     userId TEXT NOT NULL PRIMARY KEY,
     deviceId TEXT NOT NULL,
diff --git a/libraries/session-storage/impl/src/main/sqldelight/migrations/1.sqm b/libraries/session-storage/impl/src/main/sqldelight/migrations/1.sqm
index 3ee7762585..845fabc321 100644
--- a/libraries/session-storage/impl/src/main/sqldelight/migrations/1.sqm
+++ b/libraries/session-storage/impl/src/main/sqldelight/migrations/1.sqm
@@ -1 +1,3 @@
+-- Migrate DB from version 1
+
 ALTER TABLE SessionData ADD COLUMN loginTimestamp INTEGER;
diff --git a/libraries/session-storage/impl/src/main/sqldelight/migrations/2.sqm b/libraries/session-storage/impl/src/main/sqldelight/migrations/2.sqm
index 9fc7f2fdaa..0af4cf8d2b 100644
--- a/libraries/session-storage/impl/src/main/sqldelight/migrations/2.sqm
+++ b/libraries/session-storage/impl/src/main/sqldelight/migrations/2.sqm
@@ -1 +1,3 @@
+-- Migrate DB from version 2
+
 ALTER TABLE SessionData ADD COLUMN oidcData 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
index c4d0743ff5..eef6eb5efb 100644
--- a/libraries/session-storage/impl/src/main/sqldelight/migrations/3.sqm
+++ b/libraries/session-storage/impl/src/main/sqldelight/migrations/3.sqm
@@ -1,2 +1,4 @@
+-- Migrate DB from version 3
+
 ALTER TABLE SessionData ADD COLUMN isTokenValid INTEGER NOT NULL DEFAULT 1;
 ALTER TABLE SessionData ADD COLUMN loginType TEXT;