diff --git a/templates/wireguard_client.conf b/templates/wireguard_client.conf
index 00aa819..1d4cb58 100644
--- a/templates/wireguard_client.conf
+++ b/templates/wireguard_client.conf
@@ -10,7 +10,4 @@ DNS = {% if vpn_dns is defined %}{{ vpn_dns }}{% else %}{{ server_address }}{% e
 [Peer]
 PublicKey = {{ item.PublicKey }}
 AllowedIPs =  {{ item.AllowedIPs }}
-{% if item.EndPointIP is defined and item.EndPointIP != '' %}
-EndPoint = {{ item.EndPointIP }}:{{ item.listenport | default(listenport) }}
-{% endif %}
-{% endif %}{% endfor %}
+{% if item.EndPointIP is defined and item.EndPointIP != '' %}EndPoint = {{ item.EndPointIP }}:{{ item.listenport | default(listenport) }}{% endif %}{% endif %}{% endfor %}