diff --git a/Simplenote/SharedStorageMigrator.swift b/Simplenote/SharedStorageMigrator.swift
index 6b312d592..b2baf576a 100644
--- a/Simplenote/SharedStorageMigrator.swift
+++ b/Simplenote/SharedStorageMigrator.swift
@@ -33,12 +33,10 @@ class SharedStorageMigrator: NSObject {
     /// To be able to share data with app extensions, the CoreData database needs to be migrated to an app group
     /// Must run before Simperium is setup
 
-    func performMigrationIfNeeded() -> StorageSettings {
+    func performMigrationIfNeeded() {
         if migrationNeeded {
             migrateCoreDataToAppGroup()
         }
-
-        return storageSettings
     }
 
     private var migrationNeeded: Bool {
diff --git a/Simplenote/SimplenoteAppDelegate+Swift.swift b/Simplenote/SimplenoteAppDelegate+Swift.swift
index 29f6cafbf..2b8cd6e4b 100644
--- a/Simplenote/SimplenoteAppDelegate+Swift.swift
+++ b/Simplenote/SimplenoteAppDelegate+Swift.swift
@@ -9,7 +9,8 @@ extension SimplenoteAppDelegate {
 
     @objc
     func setupStorage() {
-        let storageSettings = SharedStorageMigrator().performMigrationIfNeeded()
+        SharedStorageMigrator().performMigrationIfNeeded()
+        let storageSettings = StorageSettings()
 
         do {
             try validateStorageDirectory(at: storageSettings.storageDirectory)