diff --git a/config.sample.yaml b/config.sample.yaml
index 38412196e8db9d7832f6ecd18cc12548e40e471d..42c9c1e79502e0af77d96492b215242e675e3f41 100644
--- a/config.sample.yaml
+++ b/config.sample.yaml
@@ -213,6 +213,8 @@ thumbnails:
     - "image/jpg"
     - "image/png"
     - "image/gif"
+    - "image/heif"
+    - "image/webp"
     #- "image/svg+xml" # Be sure to have ImageMagick installed to thumbnail SVG files
 
   # Animated thumbnails can be CPU intensive to generate. To disable the generation of animated
diff --git a/src/github.com/turt2live/matrix-media-repo/controllers/thumbnail_controller/thumbnail_controller.go b/src/github.com/turt2live/matrix-media-repo/controllers/thumbnail_controller/thumbnail_controller.go
index 0fa4119496e53ef44d2fc6a8f8a3b155ee807e08..616f66377cce208dc367efc5e3934149ac7460a9 100644
--- a/src/github.com/turt2live/matrix-media-repo/controllers/thumbnail_controller/thumbnail_controller.go
+++ b/src/github.com/turt2live/matrix-media-repo/controllers/thumbnail_controller/thumbnail_controller.go
@@ -28,7 +28,15 @@ import (
 )
 
 // These are the content types that we can actually thumbnail
-var supportedThumbnailTypes = []string{"image/jpeg", "image/jpg", "image/png", "image/gif", "image/svg+xml"}
+var supportedThumbnailTypes = []string{
+	"image/jpeg",
+	"image/jpg",
+	"image/png",
+	"image/gif",
+	"image/svg+xml",
+	"image/heif",
+	"image/webp",
+}
 
 // Of the SupportedThumbnailTypes, these are the 'animated' types
 var animatedTypes = []string{"image/gif"}