diff --git a/src/client/containers/Tickets/CommentNotePartial.jsx b/src/client/containers/Tickets/CommentNotePartial.jsx
index 6c2c06274..b2a1cae1f 100644
--- a/src/client/containers/Tickets/CommentNotePartial.jsx
+++ b/src/client/containers/Tickets/CommentNotePartial.jsx
@@ -24,13 +24,20 @@ const setupImages = parent => {
   imagesEl.forEach(i => helpers.setupImageLink(i))
 }
 
+const setupLinks = parent => {
+  const linksEl = parent.body.querySelectorAll('a')
+  linksEl.forEach(i => helpers.setupLinkWarning(i))
+}
+
 class CommentNotePartial extends React.Component {
   componentDidMount () {
     setupImages(this)
+    setupLinks(this)
   }
 
   componentDidUpdate () {
     setupImages(this)
+    setupLinks(this)
   }
 
   componentWillUnmount () {}