diff --git a/app/packages/addons-service/provider.ts b/app/packages/addons-service/provider.ts
index d9088459b3..602aa683fb 100644
--- a/app/packages/addons-service/provider.ts
+++ b/app/packages/addons-service/provider.ts
@@ -51,7 +51,7 @@ export default class Provider {
     @service intl!: Intl;
 
     @tracked node?: NodeModel;
-    @tracked serviceNode?: ResourceReferenceModel;
+    @tracked serviceNode?: ResourceReferenceModel | null;
 
     currentUser: CurrentUserService;
     @tracked userReference!: UserReferenceModel;
@@ -115,7 +115,7 @@ export default class Provider {
         currentUser: CurrentUserService,
         node?: NodeModel,
         allConfiguredAddons?: EmberArray<AllConfiguredAddonTypes>,
-        resourceReference?: ResourceReferenceModel,
+        resourceReference?: ResourceReferenceModel | null,
         userReference?: UserReferenceModel,
     ) {
         setOwner(this, getOwner(provider));
@@ -179,7 +179,7 @@ export default class Provider {
     @task
     @waitFor
     async getResourceReference() {
-        if (this.node && !this.serviceNode) {
+        if (this.node && this.serviceNode === undefined) {
             const resourceRefs = await this.store.query('resource-reference', {
                 filter: {resource_uri: this.node.links.iri?.toString()},
             });
diff --git a/lib/osf-components/addon/components/addons-service/manager/component.ts b/lib/osf-components/addon/components/addons-service/manager/component.ts
index 5f4d7e30bc..2e82a342fe 100644
--- a/lib/osf-components/addon/components/addons-service/manager/component.ts
+++ b/lib/osf-components/addon/components/addons-service/manager/component.ts
@@ -58,7 +58,7 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
     @service toast!: Toast;
 
     node = this.args.node;
-    @tracked addonServiceNode?: ResourceReferenceModel;
+    @tracked addonServiceNode?: ResourceReferenceModel | null;
     @tracked userReference?: UserReferenceModel;
 
     possibleFilterTypes = Object.values(FilterTypes);
@@ -341,8 +341,10 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
         const references = await this.store.query('resource-reference', {
             filter: {resource_uri: this.node.links.iri},
         });
-        if(references) {
-            this.addonServiceNode = references.firstObject;
+        if (references) {
+            this.addonServiceNode = references.firstObject || null;
+        } else {
+            this.addonServiceNode = null;
         }
     }