diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/modbus-version-processor.abstract.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/modbus-version-processor.abstract.ts
index d520a5b1e8..abcf6ce597 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/modbus-version-processor.abstract.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/modbus-version-processor.abstract.ts
@@ -34,6 +34,7 @@ export class ModbusVersionProcessor extends GatewayConnectorVersionProcessor<any
   ) {
     super(gatewayVersionStr, connector);
   }
+
   getUpgradedVersion(): GatewayConnector<ModbusBasicConfig_v3_5_2> {
     const configurationJson = this.connector.configurationJson;
     return {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/mqtt-version-processor.abstract.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/mqtt-version-processor.abstract.ts
index 645eb64fa4..f55269eadf 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/mqtt-version-processor.abstract.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/mqtt-version-processor.abstract.ts
@@ -27,6 +27,7 @@ import { MqttVersionMappingUtil } from '../utils/mqtt-version-mapping.util';
 import { GatewayConnectorVersionProcessor } from './gateway-connector-version-processor.abstract';
 
 export class MqttVersionProcessor extends GatewayConnectorVersionProcessor<MQTTBasicConfig> {
+
   private readonly mqttRequestTypeKeys = Object.values(RequestType);
 
   constructor(
@@ -35,6 +36,7 @@ export class MqttVersionProcessor extends GatewayConnectorVersionProcessor<MQTTB
   ) {
     super(gatewayVersionStr, connector);
   }
+
   getUpgradedVersion(): GatewayConnector<MQTTBasicConfig_v3_5_2> {
     const {
       connectRequests,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/opc-version-processor.abstract.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/opc-version-processor.abstract.ts
index 11c9908058..e0337d9fe3 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/opc-version-processor.abstract.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/opc-version-processor.abstract.ts
@@ -31,6 +31,7 @@ export class OpcVersionProcessor extends GatewayConnectorVersionProcessor<OPCBas
   ) {
     super(gatewayVersionStr, connector);
   }
+
   getUpgradedVersion(): GatewayConnector<OPCBasicConfig_v3_5_2> {
     const server = this.connector.configurationJson.server as LegacyServerConfig;
     return {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
index 9be5b550ce..03765613da 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
@@ -245,6 +245,10 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
       delete value.class;
     }
 
+    if (this.gatewayVersion && !value.configVersion) {
+      value.configVersion = this.gatewayVersion;
+    }
+
     value.ts = Date.now();
 
     return value;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/modbus-version-mapping.util.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/modbus-version-mapping.util.ts
index b65d3e7449..fbb78059e1 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/modbus-version-mapping.util.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/modbus-version-mapping.util.ts
@@ -20,11 +20,14 @@ import {
   ModbusLegacySlave,
   ModbusMasterConfig,
   ModbusRegisterValues,
-  ModbusSlave, ModbusValue, ModbusValues,
+  ModbusSlave,
+  ModbusValue,
+  ModbusValues,
   SlaveConfig
 } from '@home/components/widget/lib/gateway/gateway-widget.models';
 
 export class ModbusVersionMappingUtil {
+
   static mapMasterToUpgradedVersion(master: ModbusMasterConfig): ModbusMasterConfig {
     return {
       slaves: master.slaves.map((slave: SlaveConfig) => ({
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/opc-version-mapping.util.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/opc-version-mapping.util.ts
index 161eaf7daa..35807065e9 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/opc-version-mapping.util.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/opc-version-mapping.util.ts
@@ -33,6 +33,7 @@ import {
 } from '@home/components/widget/lib/gateway/gateway-widget.models';
 
 export class OpcVersionMappingUtil {
+
   static mapServerToUpgradedVersion(server: LegacyServerConfig): ServerConfig {
     const { mapping, disableSubscriptions, ...restServer } = server;
     return {