diff --git a/src/app/workspace/resource/resource-properties/resource-properties.component.ts b/src/app/workspace/resource/resource-properties/resource-properties.component.ts
index c92f5d64e6..57b5299686 100644
--- a/src/app/workspace/resource/resource-properties/resource-properties.component.ts
+++ b/src/app/workspace/resource/resource-properties/resource-properties.component.ts
@@ -106,8 +106,10 @@ export class ResourcePropertiesComponent implements OnInit, OnDestroy {
         // subscribe to the ValueOperationEventService and listen for an event to be emitted
         this.valueOperationEventSubscriptions.push(this._valueOperationEventService.on(
             Events.ValueAdded, (newValue: AddedEventValue) => {
-                this.addValueToResource(newValue.addedValue);
-                this.hideAddValueForm();
+                if (newValue) {
+                    this.addValueToResource(newValue.addedValue);
+                    this.hideAddValueForm();
+                }
             }));
 
         this.valueOperationEventSubscriptions.push(this._valueOperationEventService.on(