diff --git a/packages/web/src/components/modals/ConnectedInstances.tsx b/packages/web/src/components/modals/ConnectedInstances.tsx
index bd525c20..527bb851 100644
--- a/packages/web/src/components/modals/ConnectedInstances.tsx
+++ b/packages/web/src/components/modals/ConnectedInstances.tsx
@@ -266,7 +266,7 @@ function AddInstanceFlow({ onDone }: { onDone: () => void }) {
 // ─── Main component ──────────────────────────────────────────────────────────
 
 function InstanceRow({ inst }: { inst: import('../../stores/instanceStore').ConnectedInstance }) {
-  const removeInstance = useInstanceStore((s) => s.removeInstance);
+  const disconnectInstance = useInstanceStore((s) => s.disconnectInstance);
   const reconnectInstance = useInstanceStore((s) => s.reconnectInstance);
   const reauthenticateInstance = useInstanceStore((s) => s.reauthenticateInstance);
   const hasPendingSync = useInstanceStore((s) => s.pendingSyncOrigins.includes(inst.origin));
@@ -345,7 +345,7 @@ function InstanceRow({ inst }: { inst: import('../../stores/instanceStore').Conn
             )
           )}
           <button
-            onClick={() => removeInstance(inst.origin)}
+            onClick={() => disconnectInstance(inst.origin)}
             className="px-2 py-1 text-xs text-txt-danger hover:bg-accent-rose/10 rounded transition-colors"
             title="Disconnect"
           >
diff --git a/packages/web/src/stores/instanceStore.ts b/packages/web/src/stores/instanceStore.ts
index 5d5e378c..9b78ef60 100644
--- a/packages/web/src/stores/instanceStore.ts
+++ b/packages/web/src/stores/instanceStore.ts
@@ -3,7 +3,7 @@ import type { User, InstanceInfoResponse, ReplicatedInstance, AuthResponse, Fede
 import { BackspaceApiClient, createApiClient, api } from '../api/client';
 import { useAuthStore } from './authStore';
 import { setApiForOriginResolver, setUserIdForOriginResolver, setOriginFromHostnameResolver, useSpaceStore } from './spaceStore';
-import { connectInstance, disconnectInstance, disconnectAllRemote } from '../hooks/useWebSocket';
+import { connectInstance, disconnectInstance as disconnectWs, disconnectAllRemote } from '../hooks/useWebSocket';
 import { syncProfileToRemote } from '../utils/profileSync';
 // Circular dependency: federationOps imports useInstanceStore, instanceStore imports this.
 // Safe because both modules access each other lazily (at call time, not import time).
@@ -163,7 +163,7 @@ interface InstanceState {
   probeInstance: (url: string) => Promise<InstanceInfoResponse & { origin: string }>;
   connectToRemote: (origin: string, password: string, displayName?: string) => Promise<void>;
   loginToRemote: (origin: string, username: string, password: string) => Promise<void>;
-  removeInstance: (origin: string) => void;
+  disconnectInstance: (origin: string) => void;
   setInstanceStatus: (origin: string, status: ConnectedInstance['status'], error?: string) => void;
   reconnectInstance: (origin: string) => Promise<void>;
   reauthenticateInstance: (origin: string, password: string) => Promise<void>;
@@ -392,22 +392,32 @@ export const useInstanceStore = create<InstanceState>((set, get) => ({
     }));
   },
 
-  removeInstance: (origin: string) => {
+  disconnectInstance: (origin: string) => {
     // Tear down WebSocket connection
-    disconnectInstance(origin);
+    disconnectWs(origin);
+
+    // Update registry entry to disconnected (preserve the entry)
+    const registry = upsertRegistryEntry(get().registry, origin, {
+      origin,
+      status: 'disconnected',
+      disconnectedAt: Date.now(),
+      errorMessage: null,
+    });
+    const registryUpdatedAt = Date.now();
 
     set((state) => {
       const updated = state.instances.filter(i => i.origin !== origin);
       const userId = useAuthStore.getState().user?.id;
       if (userId) saveCachedTokens(updated, userId);
-      return { instances: updated };
+      return { instances: updated, registry, registryUpdatedAt };
     });
 
     // Remove spaces from this instance from the space store
     useSpaceStore.getState().removeInstanceSpaces(origin);
 
-    // Sync updated list to remaining instances (fire-and-forget)
+    // Sync updated lists to remaining instances (fire-and-forget)
     get().syncInstanceList().catch(() => {});
+    get().syncRegistry().catch(() => {});
   },
 
   reconnectInstance: async (origin: string) => {
@@ -469,7 +479,7 @@ export const useInstanceStore = create<InstanceState>((set, get) => ({
     useSpaceStore.getState().removeInstanceSpaces(origin);
 
     // Disconnect any lingering WS
-    disconnectInstance(origin);
+    disconnectWs(origin);
 
     // Re-connect through the standard flow (handles register/login)
     const currentUser = useAuthStore.getState().user;
@@ -498,7 +508,7 @@ export const useInstanceStore = create<InstanceState>((set, get) => ({
     if (userId) saveCachedTokens(get().instances, userId);
 
     // Reconnect WebSocket with new token
-    disconnectInstance(origin);
+    disconnectWs(origin);
     connectInstance(origin, newToken);
   },