diff --git a/bridge/whatsapp/handlers.go b/bridge/whatsapp/handlers.go
index 04e44693..b8683cfe 100644
--- a/bridge/whatsapp/handlers.go
+++ b/bridge/whatsapp/handlers.go
@@ -359,7 +359,7 @@ func (b *Bwhatsapp) HandleDocumentMessage(message whatsapp.DocumentMessage) {
 		return
 	}
 
-	filename := fmt.Sprintf("%v%v", message.Info.Id, fileExt[0])
+	filename := fmt.Sprintf("%v", message.FileName)
 
 	b.Log.Debugf("Trying to download %s with type %s", filename, message.Type)