diff --git a/addons/mail/models/mail_link_preview.py b/addons/mail/models/mail_link_preview.py
index 6377734e06b..51b32725a2d 100644
--- a/addons/mail/models/mail_link_preview.py
+++ b/addons/mail/models/mail_link_preview.py
@@ -26,6 +26,8 @@ class LinkPreview(models.Model):
 
     @api.model
     def _create_link_previews(self, message):
+        if not message.body:
+            return
         tree = html.fromstring(message.body)
         urls = tree.xpath('//a/@href')
         link_previews = self.env['mail.link.preview']
diff --git a/addons/mail/static/src/models/composer_view.js b/addons/mail/static/src/models/composer_view.js
index dc8ab35ff52..a307ac73ca4 100644
--- a/addons/mail/static/src/models/composer_view.js
+++ b/addons/mail/static/src/models/composer_view.js
@@ -573,7 +573,7 @@ registerModel({
                 const message = messaging.models['Message'].insert(
                     messaging.models['Message'].convertData(messageData)
                 );
-                if (this.messaging.hasLinkPreviewFeature) {
+                if (this.messaging.hasLinkPreviewFeature && !message.isBodyEmpty) {
                     this.messaging.rpc({
                         route: `/mail/link_preview`,
                         params: {