diff --git a/src/components/views/messages/EditHistoryMessage.tsx b/src/components/views/messages/EditHistoryMessage.tsx
index ff726e7928..c025cac9a5 100644
--- a/src/components/views/messages/EditHistoryMessage.tsx
+++ b/src/components/views/messages/EditHistoryMessage.tsx
@@ -140,6 +140,7 @@ export default class EditHistoryMessage extends React.PureComponent<IProps, ISta
                         content={content}
                         highlights={[]}
                         stripReply
+                        renderTooltipsForAmbiguousLinks
                         renderMentionPills
                         renderCodeBlocks
                         renderSpoilers
diff --git a/src/components/views/messages/TextualBody.tsx b/src/components/views/messages/TextualBody.tsx
index 0a8cf22fb9..b51d2fa3f3 100644
--- a/src/components/views/messages/TextualBody.tsx
+++ b/src/components/views/messages/TextualBody.tsx
@@ -332,6 +332,7 @@ export default class TextualBody extends React.Component<IBodyProps, IState> {
                 linkify
                 highlights={this.props.highlights}
                 ref={this.contentRef}
+                renderTooltipsForAmbiguousLinks
                 renderKeywordPills
                 renderMentionPills
                 renderCodeBlocks