diff --git a/lib/extension/publish.js b/lib/extension/publish.js
index 380f50500..254bc405d 100644
--- a/lib/extension/publish.js
+++ b/lib/extension/publish.js
@@ -170,7 +170,8 @@ class EntityPublish extends Extension {
                 const endpointNameMatch = utils.getEndpointNames().find((n) => key.endsWith(`_${n}`));
                 if (endpointNameMatch) {
                     endpointName = endpointNameMatch;
-                    key = key.replace(`_${endpointNameMatch}`, '');
+                    const regex = new RegExp(`(_${endpointNameMatch})$`, 'gm');
+                    key = key.replace(regex, ``);
 
                     const device = target.getDevice();
                     actualTarget = device.getEndpoint(definition.endpoint(device)[endpointName]);