diff --git a/bridge/telegram/handlers.go b/bridge/telegram/handlers.go
index ad41354e..b9cc7e6f 100644
--- a/bridge/telegram/handlers.go
+++ b/bridge/telegram/handlers.go
@@ -451,6 +451,11 @@ func (b *Btelegram) handleUploadFile(msg *config.Message, chatid int64, parentID
 			Name:  fi.Name,
 			Bytes: *fi.Data,
 		}
+
+		if b.GetString("MessageFormat") == HTMLFormat {
+			fi.Comment = makeHTML(html.EscapeString(fi.Comment))
+		}
+
 		switch filepath.Ext(fi.Name) {
 		case ".jpg", ".jpe", ".png":
 			pc := tgbotapi.NewInputMediaPhoto(file)