diff --git a/template/app/main.wasp b/template/app/main.wasp
index 7055034..3d8e67b 100644
--- a/template/app/main.wasp
+++ b/template/app/main.wasp
@@ -309,6 +309,11 @@ page AdminUIButtonsPage {
   authRequired: true,
   component: import AdminUI from "@src/admin/elements/ui-elements/ButtonsPage"
 }
+
+route NotFoundRoute { path: "*", to: NotFoundPage }
+page NotFoundPage {
+  component: import { NotFoundPage } from "@src/client/components/NotFoundPage"
+}
 //#endregion
 
 //#region Contact Form Messages
diff --git a/template/app/src/client/components/NotFoundPage.tsx b/template/app/src/client/components/NotFoundPage.tsx
new file mode 100644
index 0000000..43aa559
--- /dev/null
+++ b/template/app/src/client/components/NotFoundPage.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+
+export function NotFoundPage() {
+  return (
+    <div className='flex items-center justify-center min-h-screen'>
+      <div className='text-center'>
+        <h1 className='text-6xl font-bold  mb-4'>404</h1>
+        <p className='text-lg text-bodydark mb-8'>Oops! The page you're looking for doesn't exist.</p>
+        <Link
+          to='/'
+          className='inline-block px-8 py-3 text-white bg-primary rounded-lg hover:bg-secondary transition duration-300'
+        >
+          Go Back Home
+        </Link>
+      </div>
+    </div>
+  );
+}