diff --git a/src/__tests__/NotFound.test.tsx b/src/__tests__/NotFound.test.tsx
new file mode 100644
index 0000000..ceeeba6
--- /dev/null
+++ b/src/__tests__/NotFound.test.tsx
@@ -0,0 +1,30 @@
+import { render, screen } from '@testing-library/react';
+import { expect, test, describe } from 'vitest';
+import NotFound from '@/app/not-found';
+
+describe('NotFound Component', () => {
+    test('renders 404 heading', () => {
+        render(<NotFound />);
+        const heading = screen.getByRole('heading', { level: 1 });
+        expect(heading).toHaveTextContent('404');
+    });
+
+    test('renders error message', () => {
+        render(<NotFound />);
+        const errorMessage = screen.getByText(/Oops! Page Not Found/i);
+        expect(errorMessage).toBeInTheDocument();
+    });
+
+    test('renders descriptive text', () => {
+        render(<NotFound />);
+        const description = screen.getByText(/The page you're looking for doesn't exist or has been moved/i);
+        expect(description).toBeInTheDocument();
+    });
+
+    test('renders home page link', () => {
+        render(<NotFound />);
+
+        const homeLink = screen.getByRole('link', { name: /Go back to the homepage/i });
+        expect(homeLink).toHaveAttribute('href', '/');
+    });
+});
diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx
new file mode 100644
index 0000000..5c9031a
--- /dev/null
+++ b/src/app/not-found.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import Link from 'next/link';
+import Layout from '@/components/layout/Layout';
+
+export default function NotFound() {
+  return (
+    <Layout>
+      <div className="min-h-screen flex items-center justify-center px-4 py-16">
+        <div className="max-w-2xl w-full text-center">
+          {/* 404 Header */}
+          <h1 className="text-9xl md:text-[12rem] font-bold bg-gradient-to-r from-blue-500 to-purple-600 bg-clip-text text-transparent mb-6">
+            404
+          </h1>
+          <h2 className="text-3xl md:text-4xl font-bold text-gray-200 mb-4">
+            Oops! Page Not Found
+          </h2>
+          <p className="text-lg text-gray-400 mb-8">
+            The page you&apos;re looking for doesn&apos;t exist or has been moved.
+          </p>
+
+          {/* Simple Home Link */}
+          <p className="text-gray-400">
+            <Link
+              href="/"
+              className="text-blue-400 hover:text-blue-300 underline transition-colors duration-200"
+            >
+              Go back to the homepage
+            </Link>
+          </p>
+        </div>
+      </div>
+    </Layout>
+  );
+}