diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index fb761f347..b49975444 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -83,13 +83,15 @@ const ImageWall: React.FC<IImageWallProps> = ({ images, handleImageOpen }) => {
 
   return (
     <div className="gallery">
-      <Gallery
-        photos={photos}
-        onClick={showLightboxOnClick}
-        margin={uiConfig?.imageWallOptions?.margin!}
-        direction={uiConfig?.imageWallOptions?.direction!}
-        columns={columns}
-      />
+      {photos.length ? (
+        <Gallery
+          photos={photos}
+          onClick={showLightboxOnClick}
+          margin={uiConfig?.imageWallOptions?.margin!}
+          direction={uiConfig?.imageWallOptions?.direction!}
+          columns={columns}
+        />
+      ) : null}
     </div>
   );
 };