diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
index 4a31dbc5..ca075270 100644
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@@ -112,23 +112,6 @@ export default {
       }
     }
 
-    const renderLink = (attrs, children) => {
-      const updatedLink = attrs['href'].replace(/&/g, '&')
-      const updatedChildren = children.map(child => {
-        if (typeof child === 'string') {
-          return child.replace(attrs['href'], updatedLink)
-        }
-        if (child[0] === '<span>') {
-          return <span>
-            { child[1] }
-          </span>
-        }
-        return child[1]
-      })
-      return <a {...{ attrs }} href={updatedLink}>
-        { ...updatedChildren }
-      </a>
-    }
     // Processor to use with html_tree_converter
     const processItem = (item, index, array, what) => {
       // Handle text nodes - just add emoji
@@ -193,9 +176,6 @@ export default {
               return renderMention(attrs, children)
             } else {
               currentMentions = null
-              if (attrs['href']) {
-                return renderLink(attrs, children)
-              }
               break
             }
           case 'span':
diff --git a/test/unit/specs/components/rich_content.spec.js b/test/unit/specs/components/rich_content.spec.js
index a1299e6f..ea26ee43 100644
--- a/test/unit/specs/components/rich_content.spec.js
+++ b/test/unit/specs/components/rich_content.spec.js
@@ -44,12 +44,12 @@ describe('RichContent', () => {
     const html = [
       p('Testing &#39;em all'),
       'Testing &#39;em all',
-      '<a href="http://example.com?a=1&amp;b=2">http://example.com?a=1&b=2</a>'
+      '<a href="http://example.com?a=1">http://example.com?a=1</a>'
     ].join('')
     const expected = [
       p('Testing \'em all'),
       'Testing \'em all',
-      '<a href="http://example.com?a=1&b=2">http://example.com?a=1&b=2</a>'
+      '<a href="http://example.com?a=1" target="_blank">http://example.com?a=1</a>'
     ].join('')
     const wrapper = shallowMount(RichContent, {
       global,