diff --git a/logic/peers.go b/logic/peers.go
index b608ca05..532dc5de 100644
--- a/logic/peers.go
+++ b/logic/peers.go
@@ -227,12 +227,12 @@ func GetPeerUpdateForHost(network string, host *models.Host, allNodes []models.N
 			} else if host.EndpointIPv6 != nil && peerHost.EndpointIPv6 != nil {
 				peerEndpoint = peerHost.EndpointIPv6
 			}
-			if host.EndpointIP == nil {
+			if host.EndpointIP == nil && peerEndpoint == nil {
 				if peerHost.EndpointIP != nil {
 					peerEndpoint = peerHost.EndpointIP
 				}
 			}
-			if host.EndpointIP == nil && peerEndpoint == nil {
+			if host.EndpointIPv6 == nil && peerEndpoint == nil {
 				if peerHost.EndpointIPv6 != nil {
 					peerEndpoint = peerHost.EndpointIPv6
 				}