diff --git a/src/components/controls/ScrollableImages.stories.tsx b/src/components/controls/ScrollableImages.stories.tsx
index 29b61b5..43ff6a8 100644
--- a/src/components/controls/ScrollableImages.stories.tsx
+++ b/src/components/controls/ScrollableImages.stories.tsx
@@ -71,7 +71,7 @@ export const DynamicImages: StoryObj = {
         nImages += increment;
         if (nImages === imagesList.length) {
           increment = -1;
-        } else if (nImages === 1) {
+        } else if (nImages === 0) {
           increment = 1;
         }
       }, 2000);
diff --git a/src/components/controls/ScrollableImages.tsx b/src/components/controls/ScrollableImages.tsx
index 2992336..afa63da 100644
--- a/src/components/controls/ScrollableImages.tsx
+++ b/src/components/controls/ScrollableImages.tsx
@@ -50,6 +50,11 @@ const ScrollableImages = ({
         }
         index++;
       }
+			
+	    if( currentIndex >= result.length ) {
+        setCurrentIndexWrapper( Math.max(0,result.length - 1) );
+	    }
+      
       setExtractedImages(result);
     })();
   }, [images]);