diff --git a/ui-ngx/src/app/shared/components/value-input.component.ts b/ui-ngx/src/app/shared/components/value-input.component.ts
index 06bf9ab283..d4422bfbbb 100644
--- a/ui-ngx/src/app/shared/components/value-input.component.ts
+++ b/ui-ngx/src/app/shared/components/value-input.component.ts
@@ -124,8 +124,9 @@ export class ValueInputComponent implements OnInit, ControlValueAccessor {
   onValueTypeChanged() {
     if (this.valueType === ValueType.BOOLEAN) {
       this.modelValue = false;
-    } if (this.valueType === ValueType.JSON) {
+    } else if (this.valueType === ValueType.JSON) {
       this.modelValue = {};
+      this.inputForm.form.get('value').patchValue({});
     } else {
       this.modelValue = null;
     }