diff --git a/src/image-response/components/ImagePhotoGrid.tsx b/src/image-response/components/ImagePhotoGrid.tsx
index 3a282e04..d523e19c 100644
--- a/src/image-response/components/ImagePhotoGrid.tsx
+++ b/src/image-response/components/ImagePhotoGrid.tsx
@@ -3,12 +3,7 @@
 import { Photo } from '@/photo';
 import { NextImageSize } from '@/platforms/next-image';
 import { IS_PREVIEW } from '@/app/config';
-import {
-  getOptimizedPhotoUrl,
-  getOptimizedPhotoUrlForSuffix,
-} from '@/photo/storage';
-// import { fetchBase64ImageFromUrl } from '@/utility/image';
-import { getSignedUrlForUrl } from '@/platforms/storage';
+import { getOptimizedUrlsForPhotos } from '@/photo/storage';
 
 export default async function ImagePhotoGrid({
   photos,
@@ -57,31 +52,15 @@ export default async function ImagePhotoGrid({
   const cellHeight= height / rows -
     (rows - 1) * gap / rows;
 
-  const photoDataUrls = await Promise.all(photos.map(async({ id, url }) => {
-    // Check for optimized image first
-    let optimizedUrl = getOptimizedPhotoUrlForSuffix(url, optimizedSuffix);
-    // Get presigned URL in case it's required
-    optimizedUrl = await getSignedUrlForUrl(optimizedUrl, 'GET');
-    const optimizedUrlExists = await fetch(optimizedUrl)
-      .then(res => res.ok)
-      .catch(() => false);
-
-    // Fall back on `next/image` if optimized image is not available
-    if (!optimizedUrlExists) {
-      optimizedUrl = getOptimizedPhotoUrl({
-        imageUrl: url,
-        size: nextImageWidth,
-        addBypassSecret: IS_PREVIEW,
-      });
-    }
-
-    // const data = await fetchBase64ImageFromUrl(optimizedUrl, 'image/jpeg');
-  
-    return { id, data: optimizedUrl };
-  }));
+  const photoUrls = await getOptimizedUrlsForPhotos(
+    photos,
+    optimizedSuffix,
+    nextImageWidth,
+    IS_PREVIEW,
+  );
 
   const renderPhoto = (
-    { id, data }: typeof photoDataUrls[number],
+    { id, url }: typeof photoUrls[number],
     width: number,
     height: number,
   ) =>
@@ -96,7 +75,7 @@ export default async function ImagePhotoGrid({
       }}
     >
       <img {...{
-        src: data,
+        src: url,
         style: {
           ...imageStyle,
           width: '100%',
@@ -126,7 +105,7 @@ export default async function ImagePhotoGrid({
             width: cellWidth,
             height: cellHeight * 2,
           }}>
-            {renderPhoto(photoDataUrls[0], cellWidth, cellHeight * 2)}
+            {renderPhoto(photoUrls[0], cellWidth, cellHeight * 2)}
           </div>
           {/* Small images (R) */}
           <div style={{
@@ -135,12 +114,12 @@ export default async function ImagePhotoGrid({
             width: cellWidth,
             height: cellHeight,
           }}>
-            {photoDataUrls.slice(1).map(photo =>
+            {photoUrls.slice(1).map(photo =>
               renderPhoto(photo, cellWidth, cellHeight),
             )}
           </div>
         </>
-        : photoDataUrls.slice(0, count).map(photo =>
+        : photoUrls.slice(0, count).map(photo =>
           renderPhoto(photo, cellWidth, cellHeight),
         )}
     </div>
diff --git a/src/photo/storage/index.ts b/src/photo/storage/index.ts
index 1ecbe47a..283c8e98 100644
--- a/src/photo/storage/index.ts
+++ b/src/photo/storage/index.ts
@@ -5,6 +5,7 @@ import {
 import {
   generateFileNameWithId,
   getFileNamePartsFromStorageUrl,
+  getSignedUrlForUrl,
   getStorageUrlsForPrefix,
   uploadFileFromClient,
 } from '@/platforms/storage';
@@ -155,3 +156,40 @@ export const getStorageUrlsForPhoto = async ({ url }: Photo) => {
     urls.sort((a, b) => getSortScoreForUrl(a.url) - getSortScoreForUrl(b.url)),
   );
 };
+
+export const getOptimizedUrlsForPhotos = async (
+  photos: Photo[],
+  optimizedSuffix: OptimizedSuffix,
+  nextImageWidth: NextImageSize,
+  addBypassSecret: boolean,
+) =>
+  Promise.all(photos
+    .map(async({ id, url: _url }) => {
+      // Check for optimized image first
+      const optimizedUrl =await getSignedUrlForUrl(
+        getOptimizedPhotoUrlForSuffix(_url, optimizedSuffix),
+        'GET',
+      );
+      const optimizedUrlExists = await fetch(optimizedUrl)
+        .then(res => res.ok)
+        .catch(() => false);
+
+      if (optimizedUrlExists) {
+        return { id, url: optimizedUrl };
+      } else {
+        // Fall back on `next/image` if optimized image is not available
+        const nextImageUrl = getOptimizedPhotoUrl({
+          imageUrl: _url,
+          size: nextImageWidth,
+          addBypassSecret,
+        });
+        const nextImageUrlExists = await fetch(nextImageUrl)
+          .then(res => res.ok)
+          .catch(() => false);
+        return { id, url: nextImageUrlExists ? nextImageUrl : undefined };
+      }
+    }))
+    .then(urls =>(urls.every(url => Boolean(url))
+      ? urls
+      // If any url is defined, return an empty array
+      : []) as { id: string, url: string }[]);