diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/opc-server-config/opc-server-config.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/opc-server-config/opc-server-config.component.html
index 4c992c0e21..8c3f3aaf4b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/opc-server-config/opc-server-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/opc-server-config/opc-server-config.component.html
@@ -34,12 +34,12 @@
     </div>
   </div>
   <div class="tb-form-row column-xs" fxLayoutAlign="space-between center">
-    <div class="fixed-title-width" tb-hint-tooltip-icon="{{ 'gateway.hints.opcua-timeout' | translate }}">
+    <div class="fixed-title-width" tb-hint-tooltip-icon="{{ 'gateway.hints.opc-timeout' | translate }}">
       <div tbTruncateWithTooltip>{{ 'gateway.timeout' | translate }}</div>
     </div>
     <div class="tb-flex no-gap">
       <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
-        <input matInput type="number" min="0" name="value" formControlName="timeoutInMillis" placeholder="{{ 'gateway.set' | translate }}"/>
+        <input matInput type="number" min="1000" name="value" formControlName="timeoutInMillis" placeholder="{{ 'gateway.set' | translate }}"/>
         <mat-icon matSuffix
                   matTooltipPosition="above"
                   matTooltipClass="tb-error-tooltip"
@@ -69,7 +69,7 @@
     </div>
     <div class="tb-flex no-gap">
       <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
-        <input matInput type="number" min="0" name="value"
+        <input matInput type="number" min="1000" name="value"
                formControlName="scanPeriodInMillis" placeholder="{{ 'gateway.set' | translate }}"/>
         <mat-icon matSuffix
                   matTooltipPosition="above"
@@ -90,12 +90,12 @@
     </div>
     <div class="tb-flex no-gap">
       <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
-        <input matInput type="number" min="0" name="value"
+        <input matInput type="number" min="100" name="value"
                formControlName="subCheckPeriodInMillis" placeholder="{{ 'gateway.set' | translate }}"/>
         <mat-icon matSuffix
                   matTooltipPosition="above"
                   matTooltipClass="tb-error-tooltip"
-                  [matTooltip]="'gateway.sub-check-period-error' | translate: {min: 10}"
+                  [matTooltip]="'gateway.sub-check-period-error' | translate: {min: 100}"
                   *ngIf="(serverConfigFormGroup.get('subCheckPeriodInMillis').hasError('required') ||
                          serverConfigFormGroup.get('subCheckPeriodInMillis').hasError('min')) &&
                          serverConfigFormGroup.get('subCheckPeriodInMillis').touched"
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/opc-server-config/opc-server-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/opc-server-config/opc-server-config.component.ts
index ff50480b92..5b14f16db2 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/opc-server-config/opc-server-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/opc-server-config/opc-server-config.component.ts
@@ -82,7 +82,7 @@ export class OpcServerConfigComponent implements ControlValueAccessor, Validator
       timeoutInMillis: [1000, [Validators.required, Validators.min(1000)]],
       scanPeriodInMillis: [1000, [Validators.required, Validators.min(1000)]],
       enableSubscriptions: [true, []],
-      subCheckPeriodInMillis: [10, [Validators.required, Validators.min(10)]],
+      subCheckPeriodInMillis: [100, [Validators.required, Validators.min(100)]],
       showMap: [false, []],
       security: [SecurityPolicy.BASIC128, []],
       identity: []
@@ -120,7 +120,7 @@ export class OpcServerConfigComponent implements ControlValueAccessor, Validator
       timeoutInMillis = 1000,
       scanPeriodInMillis = 1000,
       enableSubscriptions = true,
-      subCheckPeriodInMillis = 10,
+      subCheckPeriodInMillis = 100,
       showMap = false,
       security = SecurityPolicy.BASIC128,
       identity = {},
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 b32818723b..4f3895b21a 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -3169,9 +3169,9 @@
         "other": "Other",
         "save-tip": "Save configuration file",
         "scan-period": "Scan period (ms)",
-        "scan-period-error": "Scan period should be at least {{min}}(ms).",
+        "scan-period-error": "Scan period should be at least {{min}} (ms).",
         "sub-check-period": "Subscription check period (ms)",
-        "sub-check-period-error": "Subscription check period should be at least {{min}}(ms).",
+        "sub-check-period-error": "Subscription check period should be at least {{min}} (ms).",
         "security": "Security",
         "security-type": "Security type",
         "security-types": {
@@ -3283,7 +3283,7 @@
         "tidy": "Tidy",
         "tidy-tip": "Tidy config JSON",
         "timeout": "Timeout (ms)",
-        "timeout-error": "Timeout should be at least {{min}}(ms).",
+        "timeout-error": "Timeout should be at least {{min}} (ms).",
         "title-connectors-json": "Connector {{typeName}} configuration",
         "type": "Type",
         "topic-filter": "Topic filter",
@@ -3370,7 +3370,7 @@
             "framer-type": "Type of framer.",
             "file": "Your data will be stored in separated files and will be saved even after the gateway restart.",
             "sqlite": "Your data will be stored in file based database. And will be saved even after the gateway restart.",
-            "opcua-timeout": "Timeout in seconds for connecting to OPC-UA server.",
+            "opc-timeout": "Timeout in milliseconds for connecting to OPC-UA server.",
             "scan-period": "Period in milliseconds to rescan the server.",
             "sub-check-period": "Period to check the subscriptions in the OPC-UA server.",
             "enable-subscription": "If true - the gateway will subscribe to interesting nodes and wait for data update and if false - the gateway will rescan OPC-UA server every scanPeriodInMillis.",