diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.html
index b5b995e4d8..7ddf0c8cd9 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.html
@@ -586,6 +586,9 @@
                 <mat-error *ngIf="commandControl.get('command').hasError('required')">
                   {{ 'gateway.statistics.command-required' | translate }}
                 </mat-error>
+                <mat-error *ngIf="commandControl.get('command').hasError('pattern')">
+                  {{ 'gateway.statistics.command-pattern' | translate }}
+                </mat-error>
                 <mat-icon matIconSuffix style="cursor:pointer;"
                           matTooltip="{{ 'gateway.hints.command' | translate }}">info_outlined
                 </mat-icon>
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..1df76f2716 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,7 +409,7 @@ 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, Validators.pattern(/^(?=\S).*\S$/)]],
       timeout: [command.timeout || null, [Validators.required, Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.pattern(/^[^.\s]+$/)]],
     });
     commandsFormArray.push(commandFormGroup);
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index e9169dd85e..3f43a0914f 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -2783,6 +2783,7 @@
             "attribute-name-required": "Attribute name is required",
             "command": "Command",
             "command-required": "Command is required",
+            "command-pattern": "Command is not valid",
             "remove": "Remove command"
         },
         "storage": "Storage",