diff --git a/apps/dashboard/src/routes/404/+page.svelte b/apps/dashboard/src/routes/404/+page.svelte
index 4b111227..d67b1552 100644
--- a/apps/dashboard/src/routes/404/+page.svelte
+++ b/apps/dashboard/src/routes/404/+page.svelte
@@ -8,6 +8,14 @@
   const src = './bg-404.png';
   let query = new URLSearchParams($page.url.search);
   let isOrg = query.get('type') === 'org';
+
+  function handleClick() {
+    if (!isOrg) {
+      return goto('/')
+    }
+
+    return goto('/home')
+  }
 </script>
 
 <div
@@ -27,7 +35,7 @@
       the meantime, here's a joke to make you laugh:<br />
       What do you call a fish with no eyes? Fsh!
     </p>
-    <PrimaryButton label="Go to Home" className="rounded-md" onClick={() => goto('/')} />
+    <PrimaryButton label="Go to Home" className="rounded-md" onClick={handleClick} />
   </div>
 
   <img src="/classroom-404.png" alt="classroomio_error_image" class="errorImg" />
diff --git a/apps/dashboard/src/routes/home/+page.server.ts b/apps/dashboard/src/routes/home/+page.server.ts
new file mode 100644
index 00000000..ed0a0415
--- /dev/null
+++ b/apps/dashboard/src/routes/home/+page.server.ts
@@ -0,0 +1,5 @@
+import { redirect } from '@sveltejs/kit';
+
+export const load = () => {
+  throw redirect(307, 'https://classroomio.com');
+};