diff --git a/net/wireguard/Makefile b/net/wireguard/Makefile
index d47a3d3d3..097f67923 100644
--- a/net/wireguard/Makefile
+++ b/net/wireguard/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		wireguard
-PLUGIN_VERSION=		1.6
+PLUGIN_VERSION=		1.7
 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 10880a427..a7fc93079 100644
--- a/net/wireguard/pkg-descr
+++ b/net/wireguard/pkg-descr
@@ -16,6 +16,10 @@ WWW: https://www.wireguard.com/
 Changelog
 ---------
 
+1.7
+
+* Make tunnel address (wg interface address) optional
+
 1.6
 
 * Move DNS setting to advanced
diff --git a/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml b/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml
index 6a749c3d7..7b9931223 100644
--- a/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml
+++ b/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml
@@ -43,7 +43,7 @@
                 <tunneladdress type="NetworkField">
                     <default></default>
                     <FieldSeparator>,</FieldSeparator>
-                    <Required>Y</Required>
+                    <Required>N</Required>
                     <asList>Y</asList>
                 </tunneladdress>
                 <disableroutes type="BooleanField">
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 82db76190..5e03ddb00 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
@@ -5,7 +5,9 @@
 {%       if server_list.enabled == '1' %}
 [Interface]
 PrivateKey = {{ server_list.privkey }}
+{%         if server_list.tunneladdress|default('') != '' %}
 Address = {{ server_list.tunneladdress }}
+{%         endif %}
 {%         if server_list.port|default('') != '' %}
 ListenPort = {{ server_list.port }}
 {%         endif %}