diff --git a/apps/space/app/[workspace_slug]/[project_slug]/page.tsx b/apps/space/app/[workspace_slug]/[project_slug]/page.tsx
index f6ccf5081..80dd5f038 100644
--- a/apps/space/app/[workspace_slug]/[project_slug]/page.tsx
+++ b/apps/space/app/[workspace_slug]/[project_slug]/page.tsx
@@ -25,7 +25,8 @@ const WorkspaceProjectPage = observer(() => {
const routerSearchparams = useSearchParams();
const { workspace_slug, project_slug } = routerParams as { workspace_slug: string; project_slug: string };
- const board = routerSearchparams.get("board") as TIssueBoardKeys | "";
+ const board =
+ routerSearchparams && routerSearchparams.get("board") != null && (routerSearchparams.get("board") as TIssueBoardKeys | "");
// updating default board view when we are in the issues page
useEffect(() => {
diff --git a/apps/space/lib/mobx/store-init.tsx b/apps/space/lib/mobx/store-init.tsx
index 4f4b6662c..a31bc822f 100644
--- a/apps/space/lib/mobx/store-init.tsx
+++ b/apps/space/lib/mobx/store-init.tsx
@@ -1,10 +1,6 @@
"use client";
import { useEffect } from "react";
-// next imports
-import { useSearchParams } from "next/navigation";
-// interface
-import { TIssueBoardKeys } from "store/types";
// mobx store
import { useMobxStore } from "lib/mobx/store-provider";
import { RootStore } from "store/root";
@@ -12,11 +8,6 @@ import { RootStore } from "store/root";
const MobxStoreInit = () => {
const store: RootStore = useMobxStore();
- // search params
- const routerSearchparams = useSearchParams();
-
- const board = routerSearchparams.get("board") as TIssueBoardKeys;
-
useEffect(() => {
// theme
const _theme = localStorage && localStorage.getItem("app_theme") ? localStorage.getItem("app_theme") : "light";
diff --git a/apps/space/app/404/page.tsx b/apps/space/pages/404.tsx
similarity index 100%
rename from apps/space/app/404/page.tsx
rename to apps/space/pages/404.tsx
diff --git a/apps/space/pages/_app.tsx b/apps/space/pages/_app.tsx
new file mode 100644
index 000000000..8681006e1
--- /dev/null
+++ b/apps/space/pages/_app.tsx
@@ -0,0 +1,10 @@
+// styles
+import "styles/globals.css";
+// types
+import type { AppProps } from "next/app";
+
+function MyApp({ Component, pageProps }: AppProps) {
+ return