diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go
index 30958a06..ce77b062 100644
--- a/bridge/mattermost/mattermost.go
+++ b/bridge/mattermost/mattermost.go
@@ -208,7 +208,7 @@ func (b *Bmattermost) handleMatterClient(messages chan *config.Message) {
 		}
 
 		// only download avatars if we have a place to upload them (configured mediaserver)
-		if b.General.MediaServerUpload != "" {
+		if b.General.MediaServerUpload != "" || b.General.MediaDownloadPath != "" {
 			b.handleDownloadAvatar(message.UserID, message.Channel)
 		}