diff --git a/app/models/upload.rb b/app/models/upload.rb
index 350537952c5..3f1f27960c4 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -46,13 +46,10 @@ class Upload < ActiveRecord::Base
     thumbnail(width, height).present?
   end
 
-  def create_thumbnail!(width, height, crop = false)
+  def create_thumbnail!(width, height, opts = nil)
     return unless SiteSetting.create_thumbnails?
-
-    opts = {
-      allow_animation: SiteSetting.allow_animated_thumbnails,
-      crop: crop
-    }
+    opts ||= {}
+    opts[:allow_animation] = SiteSetting.allow_animated_thumbnails
 
     if get_optimized_image(width, height, opts)
       save(validate: false)
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index a8ad6ad1731..7458622c34c 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -322,14 +322,14 @@ class CookedPostProcessor
     end
 
     if upload = Upload.get_from_url(src)
-      upload.create_thumbnail!(width, height, crop)
+      upload.create_thumbnail!(width, height, crop: crop)
 
       each_responsive_ratio do |ratio|
         resized_w = (width * ratio).to_i
         resized_h = (height * ratio).to_i
 
         if upload.width && resized_w <= upload.width
-          upload.create_thumbnail!(resized_w, resized_h, crop)
+          upload.create_thumbnail!(resized_w, resized_h, crop: crop)
         end
       end
     end