diff --git a/HardcoreData/NSManagedObjectContext+Setup.swift b/HardcoreData/NSManagedObjectContext+Setup.swift
index 7953c5a..4cafca3 100644
--- a/HardcoreData/NSManagedObjectContext+Setup.swift
+++ b/HardcoreData/NSManagedObjectContext+Setup.swift
@@ -80,7 +80,10 @@ internal extension NSManagedObjectContext {
             object: rootContext,
             closure: { [weak context] (note) -> Void in
                 
-                context?.mergeChangesFromContextDidSaveNotification(note)
+                context?.performBlockAndWait { () -> Void in
+                    
+                    context?.mergeChangesFromContextDidSaveNotification(note)
+                }
                 return
             }
         )