diff --git a/packages/app/src/components/dialog-select-server.tsx b/packages/app/src/components/dialog-select-server.tsx
index 7ee185b289..5b04c9d719 100644
--- a/packages/app/src/components/dialog-select-server.tsx
+++ b/packages/app/src/components/dialog-select-server.tsx
@@ -275,6 +275,7 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
       return key
     },
     onSuccess: async (key) => {
+      if (defaultServer.defaultKey() === key) await defaultServer.setDefault(null)
       server.remove(key)
     },
     onError: (err) => showRequestError(language, err),
@@ -610,6 +611,11 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
                           <span class="text-11-regular text-text-weak border border-border-weak-base bg-surface-base px-1.5 py-0.5 rounded-md shrink-0">
                             WSL
                           </span>
+                          <Show when={defaultServer.defaultKey() === key}>
+                            <span class="text-text-base bg-surface-base text-14-regular px-1.5 rounded-xs shrink-0">
+                              {language.t("dialog.server.status.default")}
+                            </span>
+                          </Show>
                           <span class="text-12-regular text-text-weak truncate">
                             {wslRuntimeLabel(item.runtime.kind)}
                           </span>
@@ -630,7 +636,21 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
                                   <DropdownMenu.ItemLabel>Retry start</DropdownMenu.ItemLabel>
                                 </DropdownMenu.Item>
                               </Show>
-                              <Show when={retryable()}>
+                              <Show when={defaultServer.canDefault() && defaultServer.defaultKey() !== key}>
+                                <DropdownMenu.Item onSelect={() => void defaultServer.setDefault(key)}>
+                                  <DropdownMenu.ItemLabel>
+                                    {language.t("dialog.server.menu.default")}
+                                  </DropdownMenu.ItemLabel>
+                                </DropdownMenu.Item>
+                              </Show>
+                              <Show when={defaultServer.canDefault() && defaultServer.defaultKey() === key}>
+                                <DropdownMenu.Item onSelect={() => void defaultServer.setDefault(null)}>
+                                  <DropdownMenu.ItemLabel>
+                                    {language.t("dialog.server.menu.defaultRemove")}
+                                  </DropdownMenu.ItemLabel>
+                                </DropdownMenu.Item>
+                              </Show>
+                              <Show when={retryable() || defaultServer.canDefault()}>
                                 <DropdownMenu.Separator />
                               </Show>
                               <DropdownMenu.Item
@@ -671,7 +691,7 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
               const wsl = isWslSidecar(i)
               const wslDistro = wsl ? i.distro : undefined
               const blocked = () => health(key)?.healthy === false
-              const canChangeDefault = () => defaultServer.canDefault() && i.type === "http"
+              const canChangeDefault = () => defaultServer.canDefault() && (i.type === "http" || wsl)
               const canRemove = () => i.type === "http" || wsl
               const opencodeAction = () => {
                 const check = wslCheck(i)
diff --git a/packages/desktop/src/main/index.ts b/packages/desktop/src/main/index.ts
index da45ac66a7..181c6722a6 100644
--- a/packages/desktop/src/main/index.ts
+++ b/packages/desktop/src/main/index.ts
@@ -348,7 +348,9 @@ const main = Effect.gen(function* () {
       password,
     })
 
-    void wslServers.initialize().catch((error) => logger.error("wsl server initialization failed", error))
+    void wslServers
+      .initialize({ defaultServer: getDefaultServerUrl() })
+      .catch((error) => logger.error("wsl server initialization failed", error))
 
     yield* Effect.promise(() => health.wait).pipe(
       Effect.timeout("30 seconds"),
diff --git a/packages/desktop/src/main/wsl-servers.ts b/packages/desktop/src/main/wsl-servers.ts
index 34cf62f9d7..62580ce7ca 100644
--- a/packages/desktop/src/main/wsl-servers.ts
+++ b/packages/desktop/src/main/wsl-servers.ts
@@ -226,9 +226,9 @@ export function createWslServersController(appVersion: string, spawnSidecar: Spa
       return () => listeners.delete(listener)
     },
 
-    async initialize() {
+    async initialize(opts?: { defaultServer?: string | null }) {
       refreshFromStore()
-      await Promise.all(state.servers.map((item) => startServer(item.config.id)))
+      if (opts?.defaultServer?.startsWith("wsl:")) void startServer(opts.defaultServer)
     },
 
     async probeRuntime() {
diff --git a/packages/desktop/src/renderer/index.tsx b/packages/desktop/src/renderer/index.tsx
index ff31b374ef..9c3354da0d 100644
--- a/packages/desktop/src/renderer/index.tsx
+++ b/packages/desktop/src/renderer/index.tsx
@@ -18,7 +18,7 @@ import {
 import * as Sentry from "@sentry/solid"
 import type { AsyncStorage } from "@solid-primitives/storage"
 import { MemoryRouter } from "@solidjs/router"
-import { createEffect, createMemo, createResource, onCleanup, onMount } from "solid-js"
+import { createEffect, createMemo, createResource, onCleanup, onMount, Show } from "solid-js"
 import { render } from "solid-js/web"
 import pkg from "../../package.json"
 import { initI18n, t } from "./i18n"
@@ -365,16 +365,23 @@ render(() => {
       }
       return list
     })
+    const effectiveDefaultServer = createMemo(() => {
+      const key = defaultServer.latest ?? ServerConnection.Key.make("sidecar")
+      if (!key.startsWith("wsl:")) return key
+      const item = wslServers.data?.servers.find((item) => item.config.id === key)
+      if (item?.runtime.kind === "ready") return key
+      return ServerConnection.Key.make("sidecar")
+    })
     if (!ready()) return splash
 
     return (
-      <AppInterface
-        defaultServer={defaultServer.latest ?? ServerConnection.Key.make("sidecar")}
-        servers={servers()}
-        router={MemoryRouter}
-      >
-        <Inner />
-      </AppInterface>
+      <Show when={effectiveDefaultServer()} keyed>
+        {(key) => (
+          <AppInterface defaultServer={key} servers={servers()} router={MemoryRouter}>
+            <Inner />
+          </AppInterface>
+        )}
+      </Show>
     )
   }