diff --git a/client/src/app/[code]/not-found.tsx b/client/src/app/not-found.tsx
similarity index 100%
rename from client/src/app/[code]/not-found.tsx
rename to client/src/app/not-found.tsx
diff --git a/client/src/pages/404.tsx b/client/src/pages/404.tsx
deleted file mode 100644
index 4250fff..0000000
--- a/client/src/pages/404.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { useRouter } from "next/router";
-import { useEffect } from "react";
-
-// Temporary. Move to app/ directory when it's supported
-
-export default function NotFound() {
-  const router = useRouter();
-
-  useEffect(() => {
-    router.replace("/");
-  });
-
-  return null;
-}