diff --git a/Tusker/CoreData/MastodonCachePersistentStore.swift b/Tusker/CoreData/MastodonCachePersistentStore.swift
index 7062d762..837f0834 100644
--- a/Tusker/CoreData/MastodonCachePersistentStore.swift
+++ b/Tusker/CoreData/MastodonCachePersistentStore.swift
@@ -124,12 +124,13 @@ class MastodonCachePersistentStore: NSPersistentCloudKitContainer {
             
             // migrate saved data from local store to cloud store
             // this can be removed pre-app store release
-            var defaultPath = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first!
-            defaultPath.appendPathComponent("\(accountInfo!.persistenceKey)_cache.sqlite", isDirectory: false)
-            if FileManager.default.fileExists(atPath: defaultPath.path) {
+            if !FileManager.default.fileExists(atPath: cloudStoreLocation.path) {
                 group.enter()
+                var defaultPath = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first!
+                defaultPath.appendPathComponent("\(accountInfo!.persistenceKey)_cache.sqlite", isDirectory: false)
                 let defaultDesc = NSPersistentStoreDescription(url: defaultPath)
                 defaultDesc.configuration = "Default"
+                defaultDesc.setOption(true as NSNumber, forKey: NSPersistentHistoryTrackingKey)
                 let defaultPSC = NSPersistentContainer(name: "\(accountInfo!.persistenceKey)_cache", managedObjectModel: MastodonCachePersistentStore.managedObjectModel)
                 defaultPSC.persistentStoreDescriptions = [defaultDesc]
                 defaultPSC.loadPersistentStores { _, error in