diff --git a/cluster/network.go b/cluster/network.go
index 9663a0af99..addf5d0c90 100644
--- a/cluster/network.go
+++ b/cluster/network.go
@@ -91,7 +91,7 @@ func (network *Network) RemoveDuplicateEndpoints() *Network {
 		// if this endpointID doesn't exist yet, add it
 		// if this endpointID exists, but endpointIndex is not a duplicate, use
 		// this endpointIndex
-		if _, ok := endpointMap[endpointID]; !ok || !strings.HasPrefix(endpointIndex, "ep-") {
+		if _, ok := endpointMap[endpointID]; !ok || !strings.Contains(endpointIndex, endpointID) {
 			endpointMap[endpointID] = endpointIndex
 		}
 	}