diff --git a/src/opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml b/src/opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml
index f317ced72..1df770ac6 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml
@@ -48,6 +48,9 @@
                         </check001>
                     </Constraints>
                 </serverport>
+                <endpoint type="IPPortField" volatile="true">
+                    <ValidationMessage>Please specify a valid host:port combination.</ValidationMessage>
+                </endpoint>
                 <keepalive type="IntegerField">
                     <MinimumValue>1</MinimumValue>
                     <MaximumValue>86400</MaximumValue>
diff --git a/src/opnsense/mvc/app/views/OPNsense/Wireguard/general.volt b/src/opnsense/mvc/app/views/OPNsense/Wireguard/general.volt
index e7b8b128f..32ca3d2d5 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Wireguard/general.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Wireguard/general.volt
@@ -167,6 +167,7 @@
                     tunneladdress: $("#configbuilder\\.address").val(),
                     keepalive: $("#configbuilder\\.keepalive").val(),
                     server: instance_id,
+                    endpoint: endpoint.val()
                 }
             };
             ajaxCall('/api/wireguard/client/addClientBuilder', peer, function(data, status) {