diff --git a/src/components/Gallery/Gallery.tsx b/src/components/Gallery/Gallery.tsx
index 42170a7253..6c56520034 100644
--- a/src/components/Gallery/Gallery.tsx
+++ b/src/components/Gallery/Gallery.tsx
@@ -39,7 +39,6 @@ const UnMemoizedGallery = <
     () =>
       images.map((image) => ({
         source: image.image_url || image.thumb_url || '',
-        src: image.image_url || image.thumb_url || '',
       })),
     [images],
   );
@@ -81,7 +80,7 @@ const UnMemoizedGallery = <
         images={formattedArray}
         index={index}
         modalIsOpen={modalOpen}
-        toggleModal={() => toggleModal}
+        toggleModal={() => setModalOpen(!modalOpen)}
       />
     </div>
   );
diff --git a/src/components/Gallery/ModalImage.tsx b/src/components/Gallery/ModalImage.tsx
index 7a5696ed9d..a6fa9a3bc8 100644
--- a/src/components/Gallery/ModalImage.tsx
+++ b/src/components/Gallery/ModalImage.tsx
@@ -5,14 +5,14 @@ import React from 'react';
  */
 export type ModalImageProps = {
   /** The src attribute for the image element */
-  data: { src: string };
+  data: { source: string };
 };
 
 export const ModalImage: React.FC<ModalImageProps> = (props) => {
   const { data } = props;
   return (
     <div className='str-chat__modal-image__wrapper' data-testid='modal-image'>
-      <img className='str-chat__modal-image__image' src={data.src} />
+      <img className='str-chat__modal-image__image' src={data.source} />
     </div>
   );
 };