diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts
index c4e1257e64..ef4e946579 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts
@@ -409,9 +409,14 @@ export class GatewayConfigurationComponent implements OnInit {
     const commandsFormArray = this.commandFormArray();
     const commandFormGroup = this.fb.group({
       attributeOnGateway: [command.attributeOnGateway || null, [Validators.required, Validators.pattern(/^[^.\s]+$/)]],
-      command: [command.command || null, [Validators.required, Validators.pattern(/^[^.\s]+$/)]],
+      command: [command.command || null, [Validators.required]],
       timeout: [command.timeout || null, [Validators.required, Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.pattern(/^[^.\s]+$/)]],
     });
+    commandFormGroup.get('command').valueChanges.subscribe(value=>{
+      if (value && !(value as String).trim().length) {
+        commandFormGroup.get('command').setValue("", {emitEvent: false});
+      }
+    })
     commandsFormArray.push(commandFormGroup);
   }