diff --git a/components/product/product-view.tsx b/components/product/product-view.tsx
index 310f7e19c..4b9a311a7 100644
--- a/components/product/product-view.tsx
+++ b/components/product/product-view.tsx
@@ -81,7 +81,7 @@ export default function ProductView({ product, relatedProducts }: ProductViewPro
         </div>
       </div>
 
-      {relatedProducts.length > 0 && (
+      {relatedProducts && relatedProducts.length > 0 && (
         <Suspense>
           <section className="my-16 flex flex-col lg:my-24">
             <Text className="px-4 lg:px-8 2xl:px-16" variant="sectionHeading">
diff --git a/middleware.ts b/middleware.ts
index 2a111af00..2a1cb0d55 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -6,6 +6,7 @@ export default createMiddleware({
 
   // If this locale is matched, pathnames work without a prefix (e.g. `/about`)
   defaultLocale: 'sv',
+  // Dismissing this during, review when going to prod.
   localeDetection: false
 });