diff --git a/MailNotificationContentExtension/NotificationViewController.swift b/MailNotificationContentExtension/NotificationViewController.swift
index a95c88840..3a3287d59 100644
--- a/MailNotificationContentExtension/NotificationViewController.swift
+++ b/MailNotificationContentExtension/NotificationViewController.swift
@@ -37,8 +37,8 @@ class NotificationViewController: UIViewController, UNNotificationContentExtensi
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        ModelMigrator().migrateRealmIfNeeded()
         SentryDebug.setUserId(accountManager.currentUserId)
+        ModelMigrator().migrateRealmIfNeeded()
 
         activityIndicator.translatesAutoresizingMaskIntoConstraints = false
         activityIndicator.hidesWhenStopped = true
diff --git a/MailNotificationServiceExtension/NotificationService.swift b/MailNotificationServiceExtension/NotificationService.swift
index c5c0383cc..49e6232b7 100644
--- a/MailNotificationServiceExtension/NotificationService.swift
+++ b/MailNotificationServiceExtension/NotificationService.swift
@@ -38,8 +38,8 @@ final class NotificationService: UNNotificationServiceExtension {
 
     override init() {
         super.init()
-        ModelMigrator().migrateRealmIfNeeded()
         SentryDebug.setUserId(accountManager.currentUserId)
+        ModelMigrator().migrateRealmIfNeeded()
     }
 
     func prepareEmptyMessageNotification(in mailbox: Mailbox) {