diff --git a/.env b/.env
index db64c9e25..344ede6fc 100644
--- a/.env
+++ b/.env
@@ -11,6 +11,10 @@ DEFGUARD_AUTH_SESSION_LIFETIME=604800
 DEFGUARD_ADMIN_GROUPNAME=admin
 DEFGUARD_DEFAULT_ADMIN_PASSWORD=pass123
 
+### Proxy configuration ###
+# Optional. URL of proxy gRPC server
+# DEFGUARD_PROXY_URL: http://localhost:50051
+
 ### LDAP configuration ###
 DEFGUARD_LDAP_URL=ldap://localhost:389
 DEFGUARD_LDAP_SERVICE_PASSWORD=adminpassword
diff --git a/src/grpc/enrollment.rs b/src/grpc/enrollment.rs
index c81e8db86..c5ceee113 100644
--- a/src/grpc/enrollment.rs
+++ b/src/grpc/enrollment.rs
@@ -432,7 +432,7 @@ impl EnrollmentServer {
                         network_id,
                         network_name: network.name,
                         assigned_ip: wireguard_network_device.wireguard_ip.to_string(),
-                        endpoint: network.endpoint,
+                        endpoint: format!("{}:{}", network.endpoint, network.port),
                         pubkey: network.pubkey,
                         allowed_ips,
                         dns: network.dns,