diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-basic-config.abstract.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-basic-config.abstract.ts
index ce87d80a75..16f5036770 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-basic-config.abstract.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-basic-config.abstract.ts
@@ -17,11 +17,14 @@
 import { Directive } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import {
+  BrokerConfig,
   MappingType,
-  MQTTBasicConfig, MQTTBasicConfig_v3_5_2,
+  MQTTBasicConfig,
+  MQTTBasicConfig_v3_5_2,
   RequestMappingData,
   RequestMappingValue,
-  RequestType
+  RequestType,
+  WorkersConfig
 } from '@home/components/widget/lib/gateway/gateway-widget.models';
 import { isObject } from '@core/utils';
 import {
@@ -73,6 +76,14 @@ export abstract class MqttBasicConfigDirective<BasicConfig>
     });
   }
 
+  protected getBrokerMappedValue(broker: BrokerConfig, workers: WorkersConfig): BrokerConfig {
+    return {
+      ...broker,
+      maxNumberOfWorkers: workers.maxNumberOfWorkers ?? 100,
+      maxMessageNumberPerWorker: workers.maxMessageNumberPerWorker ?? 10,
+    };
+  }
+
   writeValue(basicConfig: BasicConfig): void {
     this.basicFormGroup.setValue(this.mapConfigToFormValue(basicConfig), { emitEvent: false });
   }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-basic-config.component.ts
index 9af627352a..155b91efb6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-basic-config.component.ts
@@ -26,7 +26,6 @@ import {
 import {
   MqttBasicConfigDirective
 } from '@home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-basic-config.abstract';
-import { isDefinedAndNotNull } from '@core/utils';
 import { CommonModule } from '@angular/common';
 import { SharedModule } from '@shared/shared.module';
 import {
@@ -85,19 +84,14 @@ export class MqttBasicConfigComponent extends MqttBasicConfigDirective<MQTTBasic
   }
 
   protected override getMappedValue(basicConfig: MQTTBasicConfig_v3_5_2): MQTTBasicConfig_v3_5_2 {
-    let { broker, workers, mapping, requestsMapping  } = basicConfig || {};
+    const { broker, workers, mapping, requestsMapping  } = basicConfig || {};
 
-    if (isDefinedAndNotNull(workers.maxNumberOfWorkers) || isDefinedAndNotNull(workers.maxMessageNumberPerWorker)) {
-      broker = {
-        ...broker,
-        ...workers,
-      };
-    }
-
-    if ((requestsMapping as RequestMappingData[])?.length) {
-      requestsMapping = this.getRequestDataObject(requestsMapping as RequestMappingValue[]);
-    }
-
-    return { broker, mapping, requestsMapping };
+    return {
+      broker: this.getBrokerMappedValue(broker, workers),
+      mapping,
+      requestsMapping: (requestsMapping as RequestMappingData[])?.length
+        ? this.getRequestDataObject(requestsMapping as RequestMappingValue[])
+        : {} as Record<RequestType, RequestMappingValue[]>
+    };
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-legacy-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-legacy-basic-config.component.ts
index e4577c653e..6209cef677 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-legacy-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-legacy-basic-config.component.ts
@@ -102,23 +102,16 @@ export class MqttLegacyBasicConfigComponent extends MqttBasicConfigDirective<MQT
   }
 
   protected override getMappedValue(basicConfig: MQTTBasicConfig_v3_5_2): MQTTLegacyBasicConfig {
-    let { broker, workers, mapping, requestsMapping  } = basicConfig || {};
+    const { broker, workers, mapping, requestsMapping  } = basicConfig || {};
 
-    if (isDefinedAndNotNull(workers.maxNumberOfWorkers) || isDefinedAndNotNull(workers.maxMessageNumberPerWorker)) {
-      broker = {
-        ...broker,
-        ...workers,
-      };
-    }
-
-    if ((requestsMapping as RequestMappingData[])?.length) {
-      requestsMapping = this.getRequestDataObject(requestsMapping as RequestMappingValue[]);
-    }
+    const updatedRequestMapping = (requestsMapping as RequestMappingData[])?.length
+      ? this.getRequestDataObject(requestsMapping as RequestMappingValue[])
+      : {} as Record<RequestType, RequestMappingData[]>;
 
     return {
-      broker,
+      broker: this.getBrokerMappedValue(broker, workers),
       mapping: MqttVersionMappingUtil.mapMappingToDowngradedVersion(mapping),
-      ...(MqttVersionMappingUtil.mapRequestsToDowngradedVersion(requestsMapping as Record<RequestType, RequestMappingData[]>))
+      ...(MqttVersionMappingUtil.mapRequestsToDowngradedVersion(updatedRequestMapping as Record<RequestType, RequestMappingData[]>))
     };
   }
 }