diff --git a/framework/vendure/api/operations/get-all-blogs.ts b/framework/vendure/api/operations/get-all-blogs.ts
index d3998aa59..3dc6565fa 100644
--- a/framework/vendure/api/operations/get-all-blogs.ts
+++ b/framework/vendure/api/operations/get-all-blogs.ts
@@ -40,7 +40,8 @@ export default function getAllBlogsOperation({
     const { data } = await config.fetch<GetAllBlogsQuery>(query, {
       variables,
     })
-    return {
+    if(data){
+      return {
         blogs: data?.blogs?.items?.map((val:BlogList)=>({
             id: val.id,
             title: val.translations[0]?.title,
@@ -54,7 +55,11 @@ export default function getAllBlogsOperation({
             createdAt: val.createdAt
         })),
         totalItems: data?.blogs?.totalItems || null
+      }
+    }else{
+      return {blogs:[]};
     }
+  
   }
 
   return getAllBlogs
diff --git a/pages/blogs.tsx b/pages/blogs.tsx
index 35369b931..a9ebf5866 100644
--- a/pages/blogs.tsx
+++ b/pages/blogs.tsx
@@ -16,7 +16,6 @@ export default function BlogsPage({ blogs, featuredBlog, totalItems }:Props) {
  
     let date = new Date(featuredBlog?.[0]?.createdAt ?? '' );
     let fullDate = date.toLocaleString('en-us', { month: 'long' }) + " " + date.getDate()+","+date.getFullYear();
-  
 
     return(
         <>