diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index b2e1b9fac26..092c6a4dc9d 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -107,14 +107,12 @@ class UploadsController < ApplicationController
     else
       tempfile = file.tempfile
       filename = file.original_filename
-      content_type = file.content_type
     end
 
     return { errors: [I18n.t("upload.file_missing")] } if tempfile.nil?
 
     opts = {
       type: type,
-      content_type: content_type,
       for_private_message: for_private_message,
       pasted: pasted,
     }
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index 482310564f8..a063bdb361f 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -14,7 +14,6 @@ class UploadCreator
 
   # Available options
   #  - type (string)
-  #  - content_type (string)
   #  - origin (string)
   #  - for_group_message (boolean)
   #  - for_theme (boolean)
@@ -39,6 +38,10 @@ class UploadCreator
         extract_image_info!
         return @upload if @upload.errors.present?
 
+        image_type = @image_info.type.to_s
+        basename = File.basename(@filename, File.extname(@filename))
+        @filename = "#{basename}.#{image_type}"
+
         if @filename[/\.svg$/i]
           whitelist_svg!
         elsif !Rails.env.test?
@@ -76,7 +79,7 @@ class UploadCreator
       @upload.sha1              = sha1
       @upload.url               = ""
       @upload.origin            = @opts[:origin][0...1000] if @opts[:origin]
-      @upload.extension         = File.extname(@filename)[1..10]
+      @upload.extension         = image_type
 
       if FileHelper.is_image?(@filename)
         @upload.width, @upload.height = ImageSizer.resize(*@image_info.size)
@@ -91,10 +94,10 @@ class UploadCreator
 
       # store the file and update its url
       File.open(@file.path) do |f|
-        url = Discourse.store.store_upload(f, @upload, @opts[:content_type])
+        url = Discourse.store.store_upload(f, @upload)
+
         if url.present?
-          @upload.url = url
-          @upload.save
+          @upload.update!(url: url)
         else
           @upload.errors.add(:url, I18n.t("upload.store_failure", upload_id: @upload.id, user_id: user_id))
         end
@@ -154,7 +157,6 @@ class UploadCreator
     if File.size(jpeg_tempfile.path) < filesize * 0.85
       @file = jpeg_tempfile
       @filename = (File.basename(@filename, ".*").presence || I18n.t("image").presence || "image") + ".jpg"
-      @opts[:content_type] = "image/jpeg"
       extract_image_info!
     else
       jpeg_tempfile&.close
diff --git a/spec/fixtures/images/png_as.jpg b/spec/fixtures/images/png_as.jpg
new file mode 100644
index 00000000000..ad84dfeb4f8
Binary files /dev/null and b/spec/fixtures/images/png_as.jpg differ
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index fac1a98d8d2..63475547710 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -163,6 +163,24 @@ describe UploadsController do
         message = JSON.parse(response.body)["errors"]
         expect(message).to contain_exactly(I18n.t("upload.images.size_not_found"))
       end
+
+      describe 'when filename has the wrong extension' do
+        let(:file) do
+          Rack::Test::UploadedFile.new(file_from_fixtures("png_as.jpg"))
+        end
+
+        it 'should store the upload with the right extension' do
+          expect do
+            post "/uploads.json", params: { file: file, type: "avatar" }
+          end.to change { Upload.count }.by(1)
+
+          upload = Upload.last
+
+          expect(upload.extension).to eq('png')
+          expect(File.extname(upload.url)).to eq('.png')
+          expect(upload.original_filename).to eq('png_as.png')
+        end
+      end
     end
   end