diff --git a/src/workspaces/officerdev/src/apps/Headscale/ServersView.tsx b/src/workspaces/officerdev/src/apps/Headscale/ServersView.tsx
index 4ea0c3b4..50c9e99e 100644
--- a/src/workspaces/officerdev/src/apps/Headscale/ServersView.tsx
+++ b/src/workspaces/officerdev/src/apps/Headscale/ServersView.tsx
@@ -221,7 +221,16 @@ export const ServersView = () => {
           }
         />
 
-        {formFor && <ServerForm server={formFor === 'new' ? null : formFor} onClose={() => setFormFor(null)} />}
+        {/* Keyed by which server it edits: the form seeds its fields from the prop once, at mount, so
+            switching straight from one server's Edit to another's would otherwise keep the first one's
+            values — and submit diffs those stale values against the NEW server, writing them to it. */}
+        {formFor && (
+          <ServerForm
+            key={formFor === 'new' ? 'new' : formFor.id}
+            server={formFor === 'new' ? null : formFor}
+            onClose={() => setFormFor(null)}
+          />
+        )}
 
         {actionError && <ErrorNote>{actionError}</ErrorNote>}