diff --git a/client/components/Windows/Settings.vue b/client/components/Windows/Settings.vue
index 9f2cfdbd..927e70c5 100644
--- a/client/components/Windows/Settings.vue
+++ b/client/components/Windows/Settings.vue
@@ -246,13 +246,7 @@
 							type="checkbox"
 							name="removeImageMetadata"
 						/>
-						Attempt to remove metadata from images before uploading
-						<span
-							class="tooltipped tooltipped-n tooltipped-no-delay"
-							aria-label="This option will removes metadata from images and animated wepb files. This may break the images orientation."
-						>
-							<button class="extra-help" />
-						</span>
+						Remove metadata from uploaded images
 					</label>
 				</div>
 			</div>
diff --git a/src/plugins/uploader.js b/src/plugins/uploader.js
index cd616380..a878ebdd 100644
--- a/src/plugins/uploader.js
+++ b/src/plugins/uploader.js
@@ -251,8 +251,12 @@ class Uploader {
 						chunks.push(chunk);
 					})
 					.on("end", () => {
-						const buffer = Buffer.concat(chunks);
-						sharp(buffer, {animated: true, pages: -1, sequentialRead: true})
+						sharp(Buffer.concat(chunks), {
+							animated: true,
+							pages: -1,
+							sequentialRead: true,
+						})
+							.rotate() // auto-orient based on the EXIF Orientation tag
 							.toFile(destPath) // Removes metadata by default https://sharp.pixelplumbing.com/api-output#tofile
 							.catch(abortWithError);
 					});