diff --git a/frontend/src/ServerManager.jsx b/frontend/src/ServerManager.jsx
index 4ea8667..6664b15 100644
--- a/frontend/src/ServerManager.jsx
+++ b/frontend/src/ServerManager.jsx
@@ -1446,7 +1446,10 @@ function EditServerModal({ show, server, onChange, onSave, onClose }) {
   const ensureGateways = (srv) => {
     if (!srv) return {};
     const needs = NEEDS_GATEWAYS(srv.type);
-    const gateways = needs ? normalizeGateways(srv.gateways, srv.gateway || srv.dns || srv.ip) : [];
+    let gateways = needs ? normalizeGateways(srv.gateways, srv.gateway || srv.dns || srv.ip) : [];
+    if (needs && gateways.length === 0) {
+      gateways = [makeGateway({ primary: true })];
+    }
     return { ...srv, gateways };
   };