diff --git a/addons/api/addon/models/base.js b/addons/api/addon/models/base.js index 6ba189d5e..3084f7bf4 100644 --- a/addons/api/addon/models/base.js +++ b/addons/api/addon/models/base.js @@ -57,7 +57,7 @@ export default class BaseModel extends Model { get scopeModel() { const id = this.scopeID; - return this.store.peekRecord('scope', id); + return id ? this.store.peekRecord('scope', id) : null; } // Ember seems to have a bug with its internals and can't correctly set