diff --git a/CHANGELOG b/CHANGELOG
index 1cb338f16da47f3b4f40166638e1d4dea1b0b9b8..fff641fcb4814b1fc4c441d8f17dbe7e7c6ccdc8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.0.1
+  - Fix cases where Markdown did not render links in activity feed (Stan Hu)
   - Improve CI migration procedure and documentation
 
 v 8.0.0
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index 78bf25f55e766ee36a9e51e5d952eabd5540b1f2..153a44870f6649bfb0ba993ca90d82bee3714490 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -165,7 +165,7 @@ module GitlabMarkdownHelper
   # and return true.  Otherwise return false.
   def truncate_if_block(node, truncated)
     if node.element? && node.description.block? && !truncated
-      node.content = "#{node.content}..." if node.next_sibling
+      node.inner_html = "#{node.inner_html}..." if node.next_sibling
       true
     else
       truncated
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index b8101ae77ec56dd035c68dd2256b5d157c0be850..be0e0c747b7d99b176f82257f8b8b04702b0a022 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -146,4 +146,24 @@ describe GitlabMarkdownHelper do
       expect(random_markdown_tip).to eq 'Random tip'
     end
   end
+
+  describe '#first_line_in_markdown' do
+    let(:text) { "@#{user.username}, can you look at this?\nHello world\n"}
+
+    it 'truncates Markdown properly' do
+      actual = first_line_in_markdown(text, 100, project: project)
+
+      doc = Nokogiri::HTML.parse(actual)
+
+      # Make sure we didn't create invalid markup
+      expect(doc.errors).to be_empty
+
+      # Leading user link
+      expect(doc.css('a').length).to eq(1)
+      expect(doc.css('a')[0].attr('href')).to eq user_path(user)
+      expect(doc.css('a')[0].text).to eq "@#{user.username}"
+
+      expect(doc.content).to eq "@#{user.username}, can you look at this?..."
+    end
+  end
 end