diff --git a/platform/src/components/aws/ssr-site.ts b/platform/src/components/aws/ssr-site.ts
index f8063d18f3..5fdf282834 100644
--- a/platform/src/components/aws/ssr-site.ts
+++ b/platform/src/components/aws/ssr-site.ts
@@ -943,8 +943,13 @@ async function handler(event) {
     metadata = JSON.parse(v);
   } catch (e) {}
 
-  const response = await routeSite(kvNamespace, metadata);
-  return response || event.request;
+  if (!metadata) return event.request;
+  try {
+    const response = await routeSite(kvNamespace, metadata);
+    return response || event.request;
+  } catch (e) {
+    return event.request;
+  }
 }`,
           },
           { parent: self },
diff --git a/platform/src/components/aws/static-site.ts b/platform/src/components/aws/static-site.ts
index d7aa009a3e..392d03afb0 100644
--- a/platform/src/components/aws/static-site.ts
+++ b/platform/src/components/aws/static-site.ts
@@ -1129,8 +1129,13 @@ async function handler(event) {
     metadata = JSON.parse(v);
   } catch (e) {}
 
-  const response = await routeSite(kvNamespace, metadata);
-  return response || event.request;
+  if (!metadata) return event.request;
+  try {
+    const response = await routeSite(kvNamespace, metadata);
+    return response || event.request;
+  } catch (e) {
+    return event.request;
+  }
 }`,
           },
           { parent: self },