diff --git a/CoreStoreTests/SetupTests.swift b/CoreStoreTests/SetupTests.swift
index 5a93aac..4be0452 100644
--- a/CoreStoreTests/SetupTests.swift
+++ b/CoreStoreTests/SetupTests.swift
@@ -44,8 +44,7 @@ class SetupTests: BaseTestDataTestCase {
             XCTAssertNil(stack.rootSavingContext.parent)
             XCTAssertFalse(stack.rootSavingContext.isDataStackContext)
             XCTAssertFalse(stack.rootSavingContext.isTransactionContext)
-            XCTAssertNil(stack.mainContext.parent)
-            XCTAssertEqual(stack.mainContext.persistentStoreCoordinator, stack.coordinator)
+            XCTAssertEqual(stack.mainContext.parent, stack.rootSavingContext)
             XCTAssertTrue(stack.mainContext.isDataStackContext)
             XCTAssertFalse(stack.mainContext.isTransactionContext)
             XCTAssertEqual(stack.model, model)
diff --git a/Sources/Internal/NSManagedObjectContext+Setup.swift b/Sources/Internal/NSManagedObjectContext+Setup.swift
index 57e3ec1..e02c421 100644
--- a/Sources/Internal/NSManagedObjectContext+Setup.swift
+++ b/Sources/Internal/NSManagedObjectContext+Setup.swift
@@ -99,7 +99,7 @@ internal extension NSManagedObjectContext {
     internal static func mainContextForRootContext(_ rootContext: NSManagedObjectContext) -> NSManagedObjectContext {
         
         let context = NSManagedObjectContext(concurrencyType: .mainQueueConcurrencyType)
-        context.persistentStoreCoordinator = rootContext.persistentStoreCoordinator!
+        context.parent = rootContext
         context.mergePolicy = NSRollbackMergePolicy
         context.undoManager = nil
         context.setupForCoreStoreWithContextName("com.corestore.maincontext")
diff --git a/Sources/Setup/DataStack.swift b/Sources/Setup/DataStack.swift
index 660278d..466572e 100644
--- a/Sources/Setup/DataStack.swift
+++ b/Sources/Setup/DataStack.swift
@@ -74,7 +74,6 @@ public final class DataStack: Equatable {
         self.migrationChain = migrationChain
         
         self.rootSavingContext.parentStack = self
-        self.mainContext.parentStack = self
         
         self.mainContext.isDataStackContext = true
     }