diff --git a/frontend/libs/components/gallery-modal/src/lib/GalleryDraggableItem.tsx b/frontend/libs/components/gallery-modal/src/lib/GalleryDraggableItem.tsx
index f0b750db78..0e257a3278 100644
--- a/frontend/libs/components/gallery-modal/src/lib/GalleryDraggableItem.tsx
+++ b/frontend/libs/components/gallery-modal/src/lib/GalleryDraggableItem.tsx
@@ -110,6 +110,7 @@ export const GalleryDraggableItem: React.FC<GalleryDraggableItemProps> = ({
               </div>
             ) : (
               <img
+                data-gallery-draggable-1="true"
                 ref={imgRef}
                 src={item.thumbnail}
                 alt={item.label}
@@ -177,6 +178,7 @@ export const GalleryDraggableItem: React.FC<GalleryDraggableItemProps> = ({
                 </div>
               ) : (
                 <img
+                  data-gallery-draggable-2="true"
                   ref={imgRef}
                   src={item.thumbnail}
                   alt={item.label}
diff --git a/frontend/libs/components/gallery-modal/src/lib/gallery-modal.tsx b/frontend/libs/components/gallery-modal/src/lib/gallery-modal.tsx
index fbb83838dd..5ea96be2ec 100644
--- a/frontend/libs/components/gallery-modal/src/lib/gallery-modal.tsx
+++ b/frontend/libs/components/gallery-modal/src/lib/gallery-modal.tsx
@@ -153,6 +153,7 @@ export const GalleryModal = React.memo(
 
     const handleImageError = useCallback(
       (url: string) => {
+        console.error(`Failed to load gallery modal image: ${url}`);
         failedImageUrls.add(url);
       },
       [failedImageUrls]
@@ -234,7 +235,7 @@ export const GalleryModal = React.memo(
               label: item.maybe_title || "Image Generation",
               thumbnail:
                 item.media_class === "video"
-                  ? item.media_links.maybe_video_previews.still
+                  ? item.media_links.maybe_video_previews.animated
                   : item.media_class === "dimensional"
                   ? item.cover_image?.maybe_cover_image_public_bucket_url
                   : item.media_links.maybe_thumbnail_template?.replace(
diff --git a/frontend/libs/components/lightbox-modal/src/lib/lightbox-modal.tsx b/frontend/libs/components/lightbox-modal/src/lib/lightbox-modal.tsx
index 7af4a1f1ad..bb0b46dcc5 100644
--- a/frontend/libs/components/lightbox-modal/src/lib/lightbox-modal.tsx
+++ b/frontend/libs/components/lightbox-modal/src/lib/lightbox-modal.tsx
@@ -94,6 +94,7 @@ export function LightboxModal({
             </video>
           ) : (
             <img
+              data-lightbox-modal="true"
               src={imageTagImageUrl}
               alt={imageAlt}
               className="h-full w-full object-contain"