diff --git a/e2e-tests/cypress/tests/fixtures/mm_file_testing/Images/WEBP.webp b/e2e-tests/cypress/tests/fixtures/mm_file_testing/Images/WEBP.webp
new file mode 100644
index 0000000000..b5bf572afb
Binary files /dev/null and b/e2e-tests/cypress/tests/fixtures/mm_file_testing/Images/WEBP.webp differ
diff --git a/e2e-tests/cypress/tests/integration/channels/files_and_attachments/file_preview_image_spec.js b/e2e-tests/cypress/tests/integration/channels/files_and_attachments/file_preview_image_spec.js
index 9638e1ed0f..9fb644475e 100644
--- a/e2e-tests/cypress/tests/integration/channels/files_and_attachments/file_preview_image_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/files_and_attachments/file_preview_image_spec.js
@@ -103,6 +103,18 @@ describe('Upload Files - Image', () => {
 
         testImage(properties);
     });
+
+    it('MM-T2264_7 - WEBP', () => {
+        const properties = {
+            filePath: 'mm_file_testing/Images/WEBP.webp',
+            fileName: 'WEBP.webp',
+            originalWidth: 640,
+            originalHeight: 426,
+            mimeType: 'image/webp',
+        };
+
+        testImage(properties);
+    });
 });
 
 function testImage(properties) {
diff --git a/webapp/channels/src/utils/constants.tsx b/webapp/channels/src/utils/constants.tsx
index e3744e3b0f..a7eb36fbd7 100644
--- a/webapp/channels/src/utils/constants.tsx
+++ b/webapp/channels/src/utils/constants.tsx
@@ -1460,7 +1460,7 @@ export const Constants = {
     DEFAULT_CHARACTER_LIMIT: 4000,
     IMAGE_TYPE_GIF: 'gif',
     TEXT_TYPES: ['txt', 'rtf', 'vtt'],
-    IMAGE_TYPES: ['jpg', 'gif', 'bmp', 'png', 'jpeg', 'tiff', 'tif', 'psd'],
+    IMAGE_TYPES: ['jpg', 'gif', 'bmp', 'png', 'jpeg', 'tiff', 'tif', 'psd', 'webp'],
     AUDIO_TYPES: ['mp3', 'wav', 'wma', 'm4a', 'flac', 'aac', 'ogg', 'm4r'],
     VIDEO_TYPES: ['mp4', 'avi', 'webm', 'mkv', 'wmv', 'mpg', 'mov', 'flv'],
     PRESENTATION_TYPES: ['ppt', 'pptx'],