diff --git a/SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift b/SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift
index e8c1d43a7..608ca6407 100644
--- a/SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift
+++ b/SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift
@@ -13,7 +13,11 @@ enum _003_YDBToGRDBMigration: Migration {
     static let minExpectedRunDuration: TimeInterval = 0.1
     
     static func migrate(_ db: Database) throws {
-        guard !SNUtilitiesKit.isRunningTests else { return Storage.update(progress: 1, for: self, in: target) }
+        guard
+            !SNUtilitiesKit.isRunningTests &&
+            Identity.userExists(db)
+        else { return Storage.update(progress: 1, for: self, in: target) }
+        
         SNLogNotTests("[Migration Error] Attempted to perform legacy migation")
         throw StorageError.migrationNoLongerSupported
     }
diff --git a/SessionSnodeKit/Database/Migrations/_003_YDBToGRDBMigration.swift b/SessionSnodeKit/Database/Migrations/_003_YDBToGRDBMigration.swift
index 7528e7992..eb9ff2c71 100644
--- a/SessionSnodeKit/Database/Migrations/_003_YDBToGRDBMigration.swift
+++ b/SessionSnodeKit/Database/Migrations/_003_YDBToGRDBMigration.swift
@@ -11,7 +11,10 @@ enum _003_YDBToGRDBMigration: Migration {
     static let minExpectedRunDuration: TimeInterval = 0.1
     
     static func migrate(_ db: Database) throws {
-        guard !SNUtilitiesKit.isRunningTests else { return Storage.update(progress: 1, for: self, in: target) }
+        guard
+            !SNUtilitiesKit.isRunningTests &&
+            Identity.userExists(db)
+        else { return Storage.update(progress: 1, for: self, in: target) }
         
         SNLogNotTests("[Migration Error] Attempted to perform legacy migation")
         throw StorageError.migrationNoLongerSupported
diff --git a/SessionUtilitiesKit/Database/Migrations/_003_YDBToGRDBMigration.swift b/SessionUtilitiesKit/Database/Migrations/_003_YDBToGRDBMigration.swift
index db1946f21..8fe1eeeea 100644
--- a/SessionUtilitiesKit/Database/Migrations/_003_YDBToGRDBMigration.swift
+++ b/SessionUtilitiesKit/Database/Migrations/_003_YDBToGRDBMigration.swift
@@ -10,7 +10,10 @@ enum _003_YDBToGRDBMigration: Migration {
     static let minExpectedRunDuration: TimeInterval = 0.1
     
     static func migrate(_ db: Database) throws {
-        guard !SNUtilitiesKit.isRunningTests else { return Storage.update(progress: 1, for: self, in: target) }
+        guard
+            !SNUtilitiesKit.isRunningTests &&
+            Identity.userExists(db)
+        else { return Storage.update(progress: 1, for: self, in: target) }
         
         SNLogNotTests("[Migration Error] Attempted to perform legacy migation")
         throw StorageError.migrationNoLongerSupported