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 ebe5ebd646..0434e9e853 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
@@ -372,9 +372,11 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
     }
     const sharedIndex = this.sharedAttributeData.findIndex(data => {
       const sharedData = data.value;
-      return sharedData.name === connectorData.name
-        && sharedData.ts && sharedData.ts <= connectorData.ts
-        && isEqual(sharedData.value, connectorData.value);
+      const hasSameName = sharedData.name === connectorData.name;
+      const hasEmptyConfig = isEqual(sharedData.configurationJson, {}) && hasSameName;
+      const hasSameConfig =isEqual(sharedData.configurationJson, connectorData.configurationJson);
+      const isRecentlyCreated = sharedData.ts && sharedData.ts <= connectorData.ts;
+      return hasSameName && isRecentlyCreated && (hasSameConfig || hasEmptyConfig);
     });
     return sharedIndex !== -1;
   }