diff --git a/api/r0/thumbnail.go b/api/r0/thumbnail.go
index 2105eb0885fcfe7c4e809c19ee222ca03f203136..fa8ffcbc8691f67594556c24a49dda5343e3aebb 100644
--- a/api/r0/thumbnail.go
+++ b/api/r0/thumbnail.go
@@ -45,7 +45,7 @@ func ThumbnailMedia(r *http.Request, rctx rcontext.RequestContext, user api.User
 
 	width := 0
 	height := 0
-	animated := false
+	animated := rctx.Config.Thumbnails.AllowAnimated && rctx.Config.Thumbnails.DefaultAnimated
 
 	if widthStr != "" {
 		parsedWidth, err := strconv.Atoi(widthStr)