diff --git a/packages/store/addon/-private/system/core-store.ts b/packages/store/addon/-private/system/core-store.ts index 74654a106fb..88306d2bd58 100644 --- a/packages/store/addon/-private/system/core-store.ts +++ b/packages/store/addon/-private/system/core-store.ts @@ -2685,11 +2685,7 @@ abstract class CoreStore extends Service { @param {Object} data */ _load(data: ExistingResourceObject) { - const resource: ResourceIdentifierObject = constructResource( - normalizeModelName(data.type), - ensureStringId(data.id), - coerceId(data.lid) - ); + const resource = constructResource(normalizeModelName(data.type), ensureStringId(data.id), coerceId(data.lid)); let internalModel = internalModelFactoryFor(this).lookup(resource, data); diff --git a/packages/store/addon/-private/system/references/reference.ts b/packages/store/addon/-private/system/references/reference.ts index 1f69ed3a06d..d97c45fbb9c 100644 --- a/packages/store/addon/-private/system/references/reference.ts +++ b/packages/store/addon/-private/system/references/reference.ts @@ -62,7 +62,11 @@ abstract class Reference { } get recordData() { - return internalModelForReference(this)?._recordData; + if (RECORD_ARRAY_MANAGER_IDENTIFIERS) { + this.store.recordDataFor(REFERENCE_CACHE.get(this) as StableRecordIdentifier, false); + } else { + return internalModelForReference(this)?._recordData; + } } public _resource(): ResourceIdentifier | JsonApiRelationship | void {}