diff --git a/ui/src/album/AlbumDetails.jsx b/ui/src/album/AlbumDetails.jsx
index de5869856..742232473 100644
--- a/ui/src/album/AlbumDetails.jsx
+++ b/ui/src/album/AlbumDetails.jsx
@@ -273,14 +273,13 @@ const AlbumDetails = (props) => {
 
   const openGallery = () => {
     if (imageError) return
+    setImages([])
+    setPhotoIndex(0)
+    handleOpenLightbox()
     dataProvider
       .getAlbumImages(record.id)
       .then(({ data }) => setImages(Array.isArray(data) ? data : []))
       .catch(() => setImages([]))
-      .finally(() => {
-        setPhotoIndex(0)
-        handleOpenLightbox()
-      })
   }
 
   const closeGallery = () => {