diff --git a/src/image-viewer/image-viewer.ts b/src/image-viewer/image-viewer.ts
index c48f02ef8..3c7a677a1 100644
--- a/src/image-viewer/image-viewer.ts
+++ b/src/image-viewer/image-viewer.ts
@@ -42,10 +42,12 @@ export default class ImageViewer extends SuperComponent {
   }
 
   observers = {
-    visible(value) {
-      this.setData({
-        currentSwiperIndex: value ? this.properties.initialIndex : 0,
-      });
+    'visible,initialIndex,images'(visible, initialIndex, images) {
+      if (visible && images?.length) {
+        this.setData({
+          currentSwiperIndex: initialIndex >= images.length ? images.length - 1 : initialIndex,
+        });
+      }
     },
 
     closeBtn(v) {