diff --git a/apps/dashboard/src/routes/+error.svelte b/apps/dashboard/src/routes/+error.svelte
index 49d023db..9cce35b9 100644
--- a/apps/dashboard/src/routes/+error.svelte
+++ b/apps/dashboard/src/routes/+error.svelte
@@ -11,7 +11,7 @@
   console.error('Error page:', page.url);
 
   function goHome() {
-    window.location.href = '/';
+    window.location.href = 'https://classroomio.com';
   }
 </script>
 
diff --git a/apps/website/src/lib/components/not-found.svelte b/apps/website/src/lib/components/not-found.svelte
index 9bb21fad..44717f10 100644
--- a/apps/website/src/lib/components/not-found.svelte
+++ b/apps/website/src/lib/components/not-found.svelte
@@ -14,10 +14,6 @@
   let { isOrg = false, className = '' } = $props();
 
   function handleClick() {
-    if (!isOrg) {
-      return goto('/');
-    }
-
     return goto('https://classroomio.com');
   }
 </script>