diff --git a/src/app/settings/layout.tsx b/src/app/settings/layout.tsx
index fa78337..80639ad 100644
--- a/src/app/settings/layout.tsx
+++ b/src/app/settings/layout.tsx
@@ -30,7 +30,7 @@ export default function SettingsLayout({
             }
             className="w-full items-center justify-start gap-2"
           >
-            <ArrowRightLeft className="h-5 w-5" /> Wisp Switcher
+            <ArrowRightLeft className="h-5 w-5" /> Wisp
           </Button>
         </NextLink>
         <NextLink href="/settings/credits/">
diff --git a/src/app/settings/wisp/page.tsx b/src/app/settings/wisp/page.tsx
index e5a48e1..f4c7cbb 100644
--- a/src/app/settings/wisp/page.tsx
+++ b/src/app/settings/wisp/page.tsx
@@ -17,7 +17,7 @@ import {
 import { Input } from "@/components/ui/input";
 import { Separator } from "@/components/ui/separator";
 import { Save, RotateCcw } from "lucide-react";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { toast } from "sonner";
 
 const formSchema = z.object({
@@ -34,6 +34,16 @@ export default function WispSwitcher() {
     },
   });
 
+  useEffect(() => {
+    const wispServer: string = window.chemical.getStore("wisp");
+    const defaultWisp: string =
+      (location.protocol === "https:" ? "wss" : "ws") +
+      "://" +
+      location.host +
+      "/wisp/";
+    form.setValue("wispServer", wispServer !== defaultWisp ? wispServer : "");
+  }, []);
+
   function onSubmit(values: z.infer<typeof formSchema>) {
     setSubmitting(true);
 
@@ -53,7 +63,7 @@ export default function WispSwitcher() {
 
   return (
     <div>
-      <h1 className="text-4xl font-semibold">Wisp Switcher</h1>
+      <h1 className="text-4xl font-semibold">Wisp</h1>
       <Separator />
       <div className="mt-4">
         <Form {...form}>
@@ -66,7 +76,7 @@ export default function WispSwitcher() {
               name="wispServer"
               render={({ field }) => (
                 <FormItem>
-                  <FormLabel>Wisp Server</FormLabel>
+                  <FormLabel>Wisp Server Switcher</FormLabel>
                   <FormControl>
                     <Input placeholder="Wisp Server URL" {...field} />
                   </FormControl>