diff --git a/addon/-private/system/store.js b/addon/-private/system/store.js index 13aaccffb42..2cc4f400294 100644 --- a/addon/-private/system/store.js +++ b/addon/-private/system/store.js @@ -1125,7 +1125,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); + } }, /** @@ -2625,6 +2628,7 @@ Store = Service.extend({ this._pushedInternalModels = null; this.recordArrayManager.destroy(); + this._relationshipsPayloads = null; this._adapterCache = null; this._serializerCache = null;