diff --git a/frontend/src/ServerManager.jsx b/frontend/src/ServerManager.jsx
index d3a9f3b..9795dfd 100644
--- a/frontend/src/ServerManager.jsx
+++ b/frontend/src/ServerManager.jsx
@@ -1538,7 +1538,7 @@ function EditServerModal({ show, server, onChange, onSave, onClose }) {
                 <label className="form-label">Тип туннеля</label>
                 <input type="text" className="form-control" value={localServer.tunnel || ''} onChange={e => handleChange('tunnel', e.target.value)} />
               </div>
-              {NEEDS_GATEWAYS(localServer.type) && (
+            {NEEDS_GATEWAYS(localServer.type) && (
                 <>
                   <div className="form-label">Шлюзы</div>
                   <div className="list-group list-group-flush border rounded mb-2">
@@ -1633,13 +1633,15 @@ function EditServerModal({ show, server, onChange, onSave, onClose }) {
                   <button
                     type="button"
                     className="btn btn-outline-primary btn-sm"
-                    onClick={() => {
-                      const list = Array.isArray(localServer.gateways) ? localServer.gateways : [];
+                  onClick={() => {
+                    setLocalServer((prev) => {
+                      const list = Array.isArray(prev?.gateways) ? prev.gateways : [];
                       const nextList = [...list, makeGateway({ primary: list.length === 0 })];
-                      const next = { ...localServer, gateways: nextList };
-                      setLocalServer(next);
+                      const next = { ...(prev || {}), gateways: nextList };
                       onChange && onChange(next);
-                    }}
+                      return next;
+                    });
+                  }}
                   >
                     <IconPlus className="icon" />
                     Добавить шлюз