diff --git a/apps/scandic-web/app/sitemap/[sitemapId]/route.ts b/apps/scandic-web/app/sitemap/[sitemapId]/route.ts
index 1af4f382f..2dbe19f4e 100644
--- a/apps/scandic-web/app/sitemap/[sitemapId]/route.ts
+++ b/apps/scandic-web/app/sitemap/[sitemapId]/route.ts
@@ -17,6 +17,9 @@ export async function GET(
   }
 
   const sitemapId = context.params.sitemapId
+
+  console.log("[SITEMAP] Fetching sitemap by ID", sitemapId)
+
   if (!sitemapId) {
     notFound()
   }
diff --git a/apps/scandic-web/app/sitemap/route.ts b/apps/scandic-web/app/sitemap/route.ts
index 84e9d484d..70a992c4f 100644
--- a/apps/scandic-web/app/sitemap/route.ts
+++ b/apps/scandic-web/app/sitemap/route.ts
@@ -11,9 +11,18 @@ export async function GET() {
     notFound()
   }
 
+  console.log(`[SITEMAP] Fetching sitemap`)
+
   const lastUpdated = await getLastUpdated()
+
   const sitemaps = await getSitemapIds()
 
+  if (!sitemaps || sitemaps.length === 0) {
+    return new Response("No sitemaps found", { status: 404 })
+  }
+
+  console.log(`[SITEMAP] Sitemaps retrieved: ${sitemaps.length}`)
+
   const urls = sitemaps.map(
     (id) => `<sitemap>
   <loc>${env.PUBLIC_URL}/sitemap-${id}.xml</loc>
diff --git a/apps/scandic-web/middleware.ts b/apps/scandic-web/middleware.ts
index cad34e08b..b3ecafd82 100644
--- a/apps/scandic-web/middleware.ts
+++ b/apps/scandic-web/middleware.ts
@@ -125,5 +125,5 @@ export const config = {
    *  public routes inside middleware.
    *  (https://clerk.com/docs/quickstarts/nextjs?utm_source=sponsorship&utm_medium=youtube&utm_campaign=code-with-antonio&utm_content=12-31-2023#add-authentication-to-your-app)
    */
-  matcher: ["/((?!.+\\.[\\w]+$|_next|_static|.netlify|api|trpc).*)"],
+  matcher: ["/((?!.+\\.[\\w]+$|_next|_static|.netlify|api|trpc|sitemap).*)"],
 }