diff --git a/server/channels/app/imaging/decode.go b/server/channels/app/imaging/decode.go
index 59e4155e51..215c4caf27 100644
--- a/server/channels/app/imaging/decode.go
+++ b/server/channels/app/imaging/decode.go
@@ -16,6 +16,7 @@ import (
 	_ "github.com/oov/psd"
 	_ "golang.org/x/image/bmp"
 	_ "golang.org/x/image/tiff"
+	_ "golang.org/x/image/webp"
 )
 
 // DecoderOptions holds configuration options for an image decoder.
diff --git a/server/platform/shared/web/files.go b/server/platform/shared/web/files.go
index ea5ccaedda..e93c1b2ada 100644
--- a/server/platform/shared/web/files.go
+++ b/server/platform/shared/web/files.go
@@ -27,6 +27,7 @@ var MediaContentTypes = [...]string{
 	"image/bmp",
 	"image/gif",
 	"image/tiff",
+	"image/webp",
 	"video/avi",
 	"video/mpeg",
 	"video/mp4",