diff --git a/src/pages/board/[slug]/customize.tsx b/src/pages/board/[slug]/customize.tsx
index 50d1c7e9a..a83ecf33c 100644
--- a/src/pages/board/[slug]/customize.tsx
+++ b/src/pages/board/[slug]/customize.tsx
@@ -42,10 +42,12 @@ import {
 import { useBoardLink } from '~/components/layout/Templates/BoardLayout';
 import { MainLayout } from '~/components/layout/Templates/MainLayout';
 import { createTrpcServersideHelpers } from '~/server/api/helper';
+import { configRouter } from '~/server/api/routers/config';
 import { getServerAuthSession } from '~/server/auth';
 import { getServerSideTranslations } from '~/tools/server/getServerSideTranslations';
 import { checkForSessionOrAskForLogin } from '~/tools/server/loginBuilder';
 import { firstUpperCase } from '~/tools/shared/strings';
+import { ConfigType } from '~/types/config';
 import { api } from '~/utils/api';
 import { useI18nZodResolver } from '~/utils/i18n-zod-resolver';
 import { boardCustomizationSchema } from '~/validations/boards';
@@ -59,11 +61,17 @@ export default function CustomizationPage({
     slug: string;
   };
   const utils = api.useContext();
-  const { data: config } = api.config.byName.useQuery(
+  const {
+    data: config,
+    error,
+    isError,
+  } = api.config.byName.useQuery(
     { name: query.slug },
     {
       initialData: initialConfig,
       refetchOnMount: false,
+      useErrorBoundary: false,
+      suspense: false,
     }
   );
   const { mutateAsync: saveCustomization, isLoading } = api.config.saveCustomization.useMutation();
@@ -153,6 +161,12 @@ export default function CustomizationPage({
     name: firstUpperCase(query.slug),
   })} • Homarr`;
 
+  if (isError || error) {
+    return {
+      notFound: true,
+    };
+  }
+
   return (
     <MainLayout
       contentComponents={
@@ -288,15 +302,30 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
   }
 
   const session = await getServerAuthSession({ req: context.req, res: context.res });
-  
-  const result = checkForSessionOrAskForLogin(context, session, () => session?.user.isAdmin == true);
+
+  const result = checkForSessionOrAskForLogin(
+    context,
+    session,
+    () => session?.user.isAdmin == true
+  );
   if (result) {
     return result;
   }
 
   const helpers = await createTrpcServersideHelpers({ req: context.req, res: context.res });
+  const caller = configRouter.createCaller({
+    session: session,
+    cookies: context.req.cookies,
+  });
 
-  const config = await helpers.config.byName.fetch({ name: routeParams.data.slug });
+  let config: ConfigType;
+  try {
+    config = await caller.byName({ name: routeParams.data.slug });
+  } catch {
+    return {
+      notFound: true
+    };
+  }
 
   const translations = await getServerSideTranslations(
     [