diff --git a/logic/gateway.go b/logic/gateway.go
index 19014183..a84d1867 100644
--- a/logic/gateway.go
+++ b/logic/gateway.go
@@ -265,7 +265,9 @@ func DeleteIngressGateway(networkName string, nodeid string) (models.Node, bool,
 	}
 	logger.Log(3, "deleting ingress gateway")
 	wasFailover := node.Failover == "yes"
-	node.UDPHolePunch = network.DefaultUDPHolePunch
+	if node.IsServer != "yes" {
+		node.UDPHolePunch = network.DefaultUDPHolePunch
+	}
 	node.LastModified = time.Now().Unix()
 	node.IsIngressGateway = "no"
 	node.IngressGatewayRange = ""