diff --git a/bridge/telegram/telegram.go b/bridge/telegram/telegram.go
index 33d55bcd..9c3fcd9a 100644
--- a/bridge/telegram/telegram.go
+++ b/bridge/telegram/telegram.go
@@ -56,6 +56,9 @@ func (b *Btelegram) JoinChannel(channel config.ChannelInfo) error {
 }
 
 func (b *Btelegram) Send(msg config.Message) (string, error) {
+	var msgRes string
+	var msgErr error
+
 	b.Log.Debugf("=> Receiving %#v", msg)
 
 	// get the chatid
@@ -81,8 +84,8 @@ func (b *Btelegram) Send(msg config.Message) (string, error) {
 	// Upload a file if it exists
 	if msg.Extra != nil {
 		for _, rmsg := range helper.HandleExtra(&msg, b.General) {
-			if _, err := b.sendMessage(chatid, rmsg.Username, rmsg.Text); err != nil {
-				b.Log.Errorf("sendMessage failed: %s", err)
+			if msgRes, msgErr = b.sendMessage(chatid, rmsg.Username, rmsg.Text); msgErr != nil {
+				b.Log.Errorf("sendMessage failed: %s", msgErr)
 			}
 		}
 		// check if we have files to upload (from slack, telegram or mattermost)
@@ -97,7 +100,14 @@ func (b *Btelegram) Send(msg config.Message) (string, error) {
 	}
 
 	// Post normal message
-	return b.sendMessage(chatid, msg.Username, msg.Text)
+	// TODO: recheck it.
+	// Ignore empty text field needs for prevent double messages from whatsapp to telegram 
+	// when sending media with text caption
+	if msg.Text != "" {
+		msgRes, msgErr = b.sendMessage(chatid, msg.Username, msg.Text)
+	}
+
+	return msgRes, msgErr
 }
 
 func (b *Btelegram) getFileDirectURL(id string) string {