From 6ca4f1009bef8dfff63c339d2cfa38b8f33b85c0 Mon Sep 17 00:00:00 2001
From: Chris Thoburn <cthoburn@linkedin.com>
Date: Tue, 8 May 2018 13:13:11 -0700
Subject: [PATCH] [BUGFIX] dont cause unnecessary work during destroy

---
 addon/-private/system/store.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addon/-private/system/store.js b/addon/-private/system/store.js
index ec12f8047c4..01986260a42 100644
--- a/addon/-private/system/store.js
+++ b/addon/-private/system/store.js
@@ -1148,7 +1148,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);
+    }
   },
 
   /**
@@ -2798,6 +2801,7 @@ Store = Service.extend({
     this._pushedInternalModels = null;
     this.recordArrayManager.destroy();
 
+    this._relationshipsPayloads = null;
     this._adapterCache = null;
     this._serializerCache = null;