Merge pull request #5586 from jherdman/backport-5467-to-2.18

[BUGFIX Backport] #5467 to 2.18
emberjs · Aug 28, 2018 · 2a3e62c · 2a3e62c
2 parents c500cfb + 5b384bb
commit 2a3e62c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/addon/-private/system/store.js b/addon/-private/system/store.js
@@ -1151,7 +1151,10 @@ Store = Service.extend({
 
   _internalModelDestroyed(internalModel) {
     this._removeFromIdMap(internalModel);
-    this._relationshipsPayloads.unload(internalModel.modelName, internalModel.id);
+
+    if (!this.isDestroying) {
+      this._relationshipsPayloads.unload(internalModel.modelName, internalModel.id);
+    }
   },
 
   /**
@@ -2720,6 +2723,7 @@ Store = Service.extend({
     this._super(...arguments);
     this._pushedInternalModels = null;
     this.recordArrayManager.destroy();
+    this._relationshipsPayloads = null;
     this._instanceCache.destroy();
 
     this.unloadAll();