diff --git a/src/components/ImagePicker/ImagePicker.tsx b/src/components/ImagePicker/ImagePicker.tsx
index fa93461a1958d0ec3f5cfd95f76d2481ab81f82b..7362ea594db5fb9fc4a644a76872ff192ba735c8 100644
--- a/src/components/ImagePicker/ImagePicker.tsx
+++ b/src/components/ImagePicker/ImagePicker.tsx
@@ -49,7 +49,7 @@ const ImagePicker: React.FC<ImagePickerProps> = ({
           user.xsrftoken
         )
         //Split array depending on page numbers
-        setpageCount(Math.ceil(images.length / imagePerPage) - 1)
+        setpageCount(Math.ceil(images.length / imagePerPage))
         const arraySplitted = []
         while (images.length) {
           arraySplitted.push(images.splice(0, imagePerPage))
@@ -95,8 +95,8 @@ const ImagePicker: React.FC<ImagePickerProps> = ({
             <div className="image-picker">
               {imageNames &&
                 imageNames !== [] &&
-                imageNames[currentPage] !== [] &&
-                imageNames[currentPage].map((imageURL) => (
+                imageNames[currentPage - 1] !== [] &&
+                imageNames[currentPage - 1].map((imageURL) => (
                   <SingleImage
                     imageURL={imageURL}
                     key={imageURL}