diff --git a/packages/composables/src/composables/useProduct/index.ts b/packages/composables/src/composables/useProduct/index.ts
index be7a02d60..81854b4bc 100644
--- a/packages/composables/src/composables/useProduct/index.ts
+++ b/packages/composables/src/composables/useProduct/index.ts
@@ -37,7 +37,7 @@ ProductsSearchParams> = {
 
         Logger.debug('[Result]:', { data: productDetailsResults });
 
-        return productDetailsResults.data.products;
+        return productDetailsResults.data?.products;
 
       case ProductsQueryType.List:
       default:
@@ -48,7 +48,7 @@ ProductsSearchParams> = {
 
         Logger.debug('[Result]:', { data: productListResults });
 
-        return productListResults.data.products;
+        return productListResults.data?.products;
     }
   },
 };
diff --git a/packages/theme/components/RelatedProducts.vue b/packages/theme/components/RelatedProducts.vue
index 035a9689d..7c9b3c3ea 100644
--- a/packages/theme/components/RelatedProducts.vue
+++ b/packages/theme/components/RelatedProducts.vue
@@ -1,6 +1,6 @@
 <template>
   <ProductsCarousel
-    v-if="!loading && products.length > 0"
+    v-if="!loading && products && products.length"
     :products="products"
     :title="$t('Match it with')"
   />
diff --git a/packages/theme/components/UpsellProducts.vue b/packages/theme/components/UpsellProducts.vue
index c11ed97ed..06233c95a 100644
--- a/packages/theme/components/UpsellProducts.vue
+++ b/packages/theme/components/UpsellProducts.vue
@@ -1,6 +1,6 @@
 <template>
   <ProductsCarousel
-    v-if="!loading && products.length > 0"
+    v-if="!loading && products && products.length"
     :products="products"
     :title="$t('Other products you might like')"
   />