diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.ts
index 015fc97f1b..aa0424da93 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.ts
@@ -85,8 +85,8 @@ export class ModbusBasicConfigComponent implements ControlValueAccessor, Validat
 
     this.basicFormGroup.valueChanges
       .pipe(takeUntil(this.destroy$))
-      .subscribe(value => {
-        this.onChange(value);
+      .subscribe(({ master, slave }) => {
+        this.onChange({ master, slave: slave ?? {} });
         this.onTouched();
       });