diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index e412e43fa..1640c1f9c 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -18,6 +18,8 @@ def store(%Plug.Upload{} = file, should_dedupe) do
       File.cp!(file.path, result_file)
     end
 
+    strip_exif_data(content_type, file.path)
+
     %{
       "type" => "Image",
       "url" => [
@@ -67,6 +69,8 @@ def store(%{"img" => "data:image/" <> image_data}, should_dedupe) do
       File.rename(uuidpath, result_file)
     end
 
+    strip_exif_data(content_type, uuidpath)
+
     %{
       "type" => "Image",
       "url" => [
@@ -80,11 +84,12 @@ def store(%{"img" => "data:image/" <> image_data}, should_dedupe) do
     }
   end
 
-  def strip_exif_data(file) do
+  def strip_exif_data(content_type, file) do
     settings = Application.get_env(:pleroma, Pleroma.Upload)
     @do_strip = Keyword.fetch!(settings, :strip_exif)
+    [filetype, ext] = String.split(content_type, "/")
 
-    if @do_strip == true do
+    if filetype == "image" and @do_strip == true do
       Mogrify.open(file) |> Mogrify.custom("strip") |> Mogrify.save(in_place: true)
     end
   end