diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift
index 8f625c8..3eb4976 100644
--- a/passKit/Models/PasswordStore.swift
+++ b/passKit/Models/PasswordStore.swift
@@ -235,8 +235,8 @@ public class PasswordStore {
         try storeRepository.pull(storeRepository.currentBranch(), from: remote, withOptions: options, progress: progressBlock)
         Defaults.lastSyncedTime = Date()
         self.setAllSynced()
-        self.updatePasswordEntityCoreData()
         DispatchQueue.main.async {
+            self.updatePasswordEntityCoreData()
             NotificationCenter.default.post(name: .passwordStoreUpdated, object: nil)
         }
     }
@@ -566,7 +566,9 @@ public class PasswordStore {
     
     public func saveUpdatedContext() {
         do {
-            try context.save()
+            if context.hasChanges {
+                try context.save()
+            }
         } catch {
             fatalError("FailureToSaveContext".localize(error))
         }