diff --git a/app/not-found.tsx b/app/not-found.tsx
index 3bdb1ba05..db60505a2 100644
--- a/app/not-found.tsx
+++ b/app/not-found.tsx
@@ -44,7 +44,9 @@ export default function NotFound() {
         </p>
         <div className="mt-6">
           <Link
-            href={`${protocol}://${rootDomain}`}
+            href={`${protocol}://${rootDomain}?subdomain=${encodeURIComponent(
+              subdomain ?? ''
+            )}`}
             className="rounded-md bg-blue-600 px-4 py-2 text-sm font-medium text-white hover:bg-blue-700"
           >
             {subdomain ? `Create ${subdomain}` : `Go to ${rootDomain}`}
diff --git a/app/subdomain-form.tsx b/app/subdomain-form.tsx
index e26371ab1..f1d990314 100644
--- a/app/subdomain-form.tsx
+++ b/app/subdomain-form.tsx
@@ -22,6 +22,7 @@ import {
 } from '@/components/ui/emoji-picker';
 import { createSubdomainAction } from '@/app/actions';
 import { rootDomain } from '@/lib/utils';
+import { useSearchParams } from 'next/navigation';
 
 type CreateState = {
   error?: string;
@@ -132,9 +133,12 @@ export function SubdomainForm() {
     {}
   );
 
+  const searchParams = useSearchParams();
+  const subdomain = state?.subdomain ?? searchParams.get('subdomain') ?? '';
+
   return (
     <form action={action} className="space-y-4">
-      <SubdomainInput defaultValue={state?.subdomain} />
+      <SubdomainInput defaultValue={subdomain} />
 
       <IconPicker icon={icon} setIcon={setIcon} defaultValue={state?.icon} />