diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index 585832dbf..f0fd0155f 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -34,6 +34,11 @@ const mediaUpload = {
         return file
       }
 
+      // Skip if image compression is disabled
+      if (!this.$store.getters.mergedConfig.imageCompression) {
+        return file
+      }
+
       // For PNGs, check if animated
       if (file.type === 'image/png') {
         const isAnimated = await this.isAnimatedPng(file)
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index cc530996e..e3c114d71 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -241,6 +241,14 @@
           </li>
         </ul>
         <h3>{{ $t('settings.attachments') }}</h3>
+        <li>
+          <BooleanSetting
+            path="imageCompression"
+            expert="1"
+          >
+            {{ $t('settings.image_compression') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting
             path="useContainFit"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 9f4d43641..81a064b3c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -439,6 +439,7 @@
     "allow_following_move": "Allow auto-follow when following account moves",
     "attachmentRadius": "Attachments",
     "attachments": "Attachments",
+    "image_compression": "Compress images before uploading",
     "avatar": "Avatar",
     "avatarAltRadius": "Avatars (notifications)",
     "avatarRadius": "Avatars",
diff --git a/src/modules/config.js b/src/modules/config.js
index 0543062c1..7a10eb492 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -190,7 +190,8 @@ export const defaultState = {
   unsavedPostAction: undefined, // instance default
   autoSaveDraft: undefined, // instance default
   useAbsoluteTimeFormat: undefined, // instance default
-  absoluteTimeFormatMinAge: undefined // instance default
+  absoluteTimeFormatMinAge: undefined, // instance default
+  imageCompression: true
 }
 
 // caching the instance default properties