diff --git a/src/components/Attachment/Geolocation.tsx b/src/components/Attachment/Geolocation.tsx
index 9b67a3a519..5bac5f74ab 100644
--- a/src/components/Attachment/Geolocation.tsx
+++ b/src/components/Attachment/Geolocation.tsx
@@ -60,6 +60,7 @@ export const Geolocation = ({
               <button
                 className='str-chat__message-attachment-geolocation__stop-sharing-button'
                 onClick={() => channel?.stopLiveLocationSharing(location)}
+                type='button'
               >
                 {t('Stop sharing')}
               </button>
diff --git a/src/components/Attachment/__tests__/__snapshots__/Card.test.js.snap b/src/components/Attachment/__tests__/__snapshots__/Card.test.js.snap
index eedea8c26b..96a03ef8c8 100644
--- a/src/components/Attachment/__tests__/__snapshots__/Card.test.js.snap
+++ b/src/components/Attachment/__tests__/__snapshots__/Card.test.js.snap
@@ -41,6 +41,7 @@ exports[`Card (1) should render card without caption if attachment type is audio
             <button
               class="str-chat__message-attachment-audio-widget--play-button"
               data-testid="play-audio"
+              type="button"
             >
               <svg
                 fill="none"
@@ -258,6 +259,7 @@ exports[`Card (7) should render audio with caption using og_scrape_url and with
             <button
               class="str-chat__message-attachment-audio-widget--play-button"
               data-testid="play-audio"
+              type="button"
             >
               <svg
                 fill="none"
@@ -470,6 +472,7 @@ exports[`Card (10) should render audio without title if attachment type is audio
             <button
               class="str-chat__message-attachment-audio-widget--play-button"
               data-testid="play-audio"
+              type="button"
             >
               <svg
                 fill="none"
@@ -667,6 +670,7 @@ exports[`Card (13) should render audio without title and with caption using og_s
             <button
               class="str-chat__message-attachment-audio-widget--play-button"
               data-testid="play-audio"
+              type="button"
             >
               <svg
                 fill="none"
@@ -851,6 +855,7 @@ exports[`Card (16) should render audio widget with title & text in Card content
             <button
               class="str-chat__message-attachment-audio-widget--play-button"
               data-testid="play-audio"
+              type="button"
             >
               <svg
                 fill="none"
@@ -1384,6 +1389,7 @@ exports[`Card (25) should render audio widget with image loaded from thumb_url a
             <button
               class="str-chat__message-attachment-audio-widget--play-button"
               data-testid="play-audio"
+              type="button"
             >
               <svg
                 fill="none"
diff --git a/src/components/Attachment/components/PlayButton.tsx b/src/components/Attachment/components/PlayButton.tsx
index 46e09e2215..67ea75ff73 100644
--- a/src/components/Attachment/components/PlayButton.tsx
+++ b/src/components/Attachment/components/PlayButton.tsx
@@ -11,6 +11,7 @@ export const PlayButton = ({ isPlaying, onClick }: PlayButtonProps) => (
     className='str-chat__message-attachment-audio-widget--play-button'
     data-testid={isPlaying ? 'pause-audio' : 'play-audio'}
     onClick={onClick}
+    type='button'
   >
     {isPlaying ? <PauseIcon /> : <PlayTriangleIcon />}
   </button>
diff --git a/src/components/Attachment/components/PlaybackRateButton.tsx b/src/components/Attachment/components/PlaybackRateButton.tsx
index 9e6875742d..ba51a4d460 100644
--- a/src/components/Attachment/components/PlaybackRateButton.tsx
+++ b/src/components/Attachment/components/PlaybackRateButton.tsx
@@ -7,6 +7,7 @@ export const PlaybackRateButton = ({ children, onClick }: PlaybackRateButtonProp
     className='str-chat__message_attachment__playback-rate-button'
     data-testid='playback-rate-button'
     onClick={onClick}
+    type='button'
   >
     {children}
   </button>
diff --git a/src/components/MessageInput/AttachmentPreviewList/FileAttachmentPreview.tsx b/src/components/MessageInput/AttachmentPreviewList/FileAttachmentPreview.tsx
index 21e582bc47..1494a890cd 100644
--- a/src/components/MessageInput/AttachmentPreviewList/FileAttachmentPreview.tsx
+++ b/src/components/MessageInput/AttachmentPreviewList/FileAttachmentPreview.tsx
@@ -43,6 +43,7 @@ export const FileAttachmentPreview = ({
           attachment.localMetadata?.id &&
           removeAttachments([attachment.localMetadata?.id])
         }
+        type='button'
       >
         <CloseIcon />
       </button>
diff --git a/src/components/MessageInput/AttachmentPreviewList/GeolocationPreview.tsx b/src/components/MessageInput/AttachmentPreviewList/GeolocationPreview.tsx
index 32c61c989d..8faa174ef8 100644
--- a/src/components/MessageInput/AttachmentPreviewList/GeolocationPreview.tsx
+++ b/src/components/MessageInput/AttachmentPreviewList/GeolocationPreview.tsx
@@ -36,6 +36,7 @@ export const GeolocationPreview = ({
           className='str-chat__attachment-preview-delete'
           data-testid='location-preview-item-delete-button'
           onClick={remove}
+          type='button'
         >
           <CloseIcon />
         </button>
diff --git a/src/components/MessageInput/AttachmentPreviewList/ImageAttachmentPreview.tsx b/src/components/MessageInput/AttachmentPreviewList/ImageAttachmentPreview.tsx
index 879b2e8bf8..1210f1e348 100644
--- a/src/components/MessageInput/AttachmentPreviewList/ImageAttachmentPreview.tsx
+++ b/src/components/MessageInput/AttachmentPreviewList/ImageAttachmentPreview.tsx
@@ -36,6 +36,7 @@ export const ImageAttachmentPreview = ({
         data-testid='image-preview-item-delete-button'
         disabled={uploadState === 'uploading'}
         onClick={() => id && removeAttachments([id])}
+        type='button'
       >
         <CloseIcon />
       </button>
diff --git a/src/components/MessageInput/AttachmentPreviewList/UnsupportedAttachmentPreview.tsx b/src/components/MessageInput/AttachmentPreviewList/UnsupportedAttachmentPreview.tsx
index abe94a44dc..e706bfe988 100644
--- a/src/components/MessageInput/AttachmentPreviewList/UnsupportedAttachmentPreview.tsx
+++ b/src/components/MessageInput/AttachmentPreviewList/UnsupportedAttachmentPreview.tsx
@@ -40,6 +40,7 @@ export const UnsupportedAttachmentPreview = ({
           attachment.localMetadata?.id &&
           removeAttachments([attachment.localMetadata?.id])
         }
+        type='button'
       >
         <CloseIcon />
       </button>
diff --git a/src/components/MessageInput/AttachmentPreviewList/VoiceRecordingPreview.tsx b/src/components/MessageInput/AttachmentPreviewList/VoiceRecordingPreview.tsx
index 845e4ac0a0..14a08339e2 100644
--- a/src/components/MessageInput/AttachmentPreviewList/VoiceRecordingPreview.tsx
+++ b/src/components/MessageInput/AttachmentPreviewList/VoiceRecordingPreview.tsx
@@ -43,6 +43,7 @@ export const VoiceRecordingPreview = ({
         onClick={() =>
           attachment.localMetadata?.id && removeAttachments([attachment.localMetadata.id])
         }
+        type='button'
       >
         <CloseIcon />
       </button>
diff --git a/src/components/MessageInput/__tests__/__snapshots__/AttachmentPreviewList.test.js.snap b/src/components/MessageInput/__tests__/__snapshots__/AttachmentPreviewList.test.js.snap
index 7cdd12ce42..b66b86831f 100644
--- a/src/components/MessageInput/__tests__/__snapshots__/AttachmentPreviewList.test.js.snap
+++ b/src/components/MessageInput/__tests__/__snapshots__/AttachmentPreviewList.test.js.snap
@@ -25,6 +25,7 @@ exports[`AttachmentPreviewList should render custom BaseImage component 1`] = `
               class="str-chat__attachment-preview-delete"
               data-testid="image-preview-item-delete-button"
               disabled=""
+              type="button"
             >
               <svg
                 data-testid="close-no-outline"
@@ -98,6 +99,7 @@ exports[`AttachmentPreviewList should render custom BaseImage component 1`] = `
               class="str-chat__attachment-preview-delete"
               data-testid="image-preview-item-delete-button"
               disabled=""
+              type="button"
             >
               <svg
                 data-testid="close-no-outline"