diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index 0c33d7d1629..e32f15a703c 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -183,7 +183,7 @@ class OptimizedImage < ActiveRecord::Base
     end
   end
 
-  IM_DECODERS ||= /\A(jpe?g|png|ico|gif)\z/i
+  IM_DECODERS ||= /\A(jpe?g|png|ico|gif|webp)\z/i
 
   def self.prepend_decoder!(path, ext_path = nil, opts = nil)
     opts ||= {}
diff --git a/config/site_settings.yml b/config/site_settings.yml
index eb1b37c5800..a58796d187d 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1221,7 +1221,7 @@ files:
     list_type: compact
   authorized_extensions:
     client: true
-    default: "jpg|jpeg|png|gif|heic|heif"
+    default: "jpg|jpeg|png|gif|heic|heif|webp"
     refresh: true
     type: list
     list_type: compact