diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx
index bb1dfa5..c63c685 100644
--- a/src/app/not-found.tsx
+++ b/src/app/not-found.tsx
@@ -1,35 +1,5 @@
-"use client";
+import { NotFoundComponent } from "~/components/layout";
 
-import { Status } from "~/components/global";
-import { Button } from "~/components/ui/button";
-
-import useRouter from "~/hooks/usePRouter";
-
-export default function NotFoundPage() {
-  const router = useRouter();
-
-  return (
-    <div className='mx-auto flex h-full w-full max-w-screen-md flex-grow flex-col items-center justify-center gap-12'>
-      <Status
-        icon='Frown'
-        message="Can't find the file or folder you're looking for"
-      />
-
-      <div className='flex w-full items-center gap-2'>
-        <Button
-          className='grow'
-          variant={"outline"}
-          onClick={() => router.push("/")}
-        >
-          Home
-        </Button>
-        <Button
-          className='grow'
-          onClick={() => router.back()}
-        >
-          Previous Page
-        </Button>
-      </div>
-    </div>
-  );
+export default function NotFound() {
+  return <NotFoundComponent />;
 }
diff --git a/src/components/Layout/NotFound.tsx b/src/components/Layout/NotFound.tsx
new file mode 100644
index 0000000..af2d669
--- /dev/null
+++ b/src/components/Layout/NotFound.tsx
@@ -0,0 +1,34 @@
+"use client";
+
+import { Status } from "~/components/global";
+import { Button } from "~/components/ui/button";
+
+import useRouter from "~/hooks/usePRouter";
+
+export default function NotFoundClient() {
+  const router = useRouter();
+  return (
+    <div className='mx-auto flex h-full w-full max-w-screen-md flex-grow flex-col items-center justify-center gap-12'>
+      <Status
+        icon='Frown'
+        message="Can't find the file or folder you're looking for"
+      />
+
+      <div className='flex w-full items-center gap-2'>
+        <Button
+          className='grow'
+          variant={"outline"}
+          onClick={() => router.push("/")}
+        >
+          Home
+        </Button>
+        <Button
+          className='grow'
+          onClick={() => router.back()}
+        >
+          Previous Page
+        </Button>
+      </div>
+    </div>
+  );
+}