diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/state/PeerProxy.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/state/PeerProxy.kt
index b82d2b39..80f3f530 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/state/PeerProxy.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/state/PeerProxy.kt
@@ -17,7 +17,7 @@ data class PeerProxy(
                 parsePublicKey(publicKey)
                 if (preSharedKey.isNotBlank()) parsePreSharedKey(preSharedKey)
                 if (persistentKeepalive.isNotBlank()) parsePersistentKeepalive(persistentKeepalive)
-                parseEndpoint(endpoint)
+                if (endpoint.isNotBlank()) parseEndpoint(endpoint)
                 parseAllowedIPs(allowedIps)
             }
             .build()
@@ -29,7 +29,7 @@ data class PeerProxy(
                 parsePublicKey(publicKey)
                 if (preSharedKey.isNotBlank()) parsePreSharedKey(preSharedKey)
                 if (persistentKeepalive.isNotBlank()) parsePersistentKeepalive(persistentKeepalive)
-                parseEndpoint(endpoint)
+                if (endpoint.isNotBlank()) parseEndpoint(endpoint)
                 parseAllowedIPs(allowedIps)
             }
             .build()