diff --git a/net/wireguard/Makefile b/net/wireguard/Makefile
index 097f67923..5bb74f7d7 100644
--- a/net/wireguard/Makefile
+++ b/net/wireguard/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		wireguard
-PLUGIN_VERSION=		1.7
+PLUGIN_VERSION=		1.8
 PLUGIN_COMMENT=		WireGuard VPN service
 PLUGIN_DEPENDS=		wireguard-go wireguard-tools
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net/wireguard/pkg-descr b/net/wireguard/pkg-descr
index a7fc93079..753538d01 100644
--- a/net/wireguard/pkg-descr
+++ b/net/wireguard/pkg-descr
@@ -16,6 +16,10 @@ WWW: https://www.wireguard.com/
 Changelog
 ---------
 
+1.8
+
+* Empty port in Endpoint is allowed
+
 1.7
 
 * Make tunnel address (wg interface address) optional
diff --git a/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard-server.conf b/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard-server.conf
index 5e03ddb00..e76aaf1fa 100644
--- a/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard-server.conf
+++ b/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard-server.conf
@@ -35,8 +35,9 @@ PublicKey = {{ peerlist2_data.pubkey }}
 PresharedKey = {{ peerlist2_data.psk }}
 {%               endif %}
 {%               if peerlist2_data.serveraddress|default('') != '' %}
-Endpoint = {{ peerlist2_data.serveraddress }}:{{ peerlist2_data.serverport }}
+Endpoint = {{ peerlist2_data.serveraddress }}{% if peerlist2_data.serverport|default('') != '' %}:{{ peerlist2_data.serverport }}{% else %}:51820{% endif %}
 {%               endif %}
+
 AllowedIPs = {{ peerlist2_data.tunneladdress }}
 {%               if peerlist2_data.keepalive|default('') != '' %}
 PersistentKeepalive = {{ peerlist2_data.keepalive }}