diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 9886f8623f..c0cc937e24 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -620,12 +620,13 @@ export default class MessageComposerInput extends React.Component {
                 });
             }
             if (!shouldSendHTML) {
-                const hasAnEntity = blocks.some((block) => {
+                const hasLink = blocks.some((block) => {
                     return block.getCharacterList().filter((c) => {
-                        return c.getEntity();
+                        const entityKey = c.getEntity();
+                        return entityKey && Entity.get(entityKey).getType() === 'LINK';
                     }).size > 0;
                 });
-                shouldSendHTML = hasAnEntity;
+                shouldSendHTML = hasLink;
             }
             if (shouldSendHTML) {
                 contentHTML = HtmlUtils.processHtmlForSending(