diff --git a/app/views/tag/show.html.erb b/app/views/tag/show.html.erb
index 0d1c8a186d..bfc214eef5 100644
--- a/app/views/tag/show.html.erb
+++ b/app/views/tag/show.html.erb
@@ -10,13 +10,13 @@
           </div>
           <div class="col-md-8">
             <h2><%= link_to @wiki.latest.title, "/wiki/#{params[:id]}" %></h2>
-            <%= (@wiki.latest.render_body.match(/<p>(.+)<\/p>/).first + '</p>').html_safe %>
+            <%= @wiki.latest.render_body.html_safe.match(/<p>(.+)<\/p>/).to_a.try(:first) %>
             <%= link_to("Read More", "/wiki/#{params[:id]}") if @wiki.latest.render_body.split('</p>').length > 2 %>
           </div>
         </div>
       <% else %>
         <h2><%= @wiki.latest.title %></h2>
-      <p><%= @wiki.latest.render_body.split('\n').first.html_safe %></p>
+      <p><%= @wiki.latest.render_body.html_safe.match(/<p>(.+)<\/p>/).to_a.try(:first) %></p>
         <p><%= link_to("Read More &raquo;", "/wiki/#{params[:id]}") if @wiki.latest.render_body.split('\n').length > 1 %></p>
       <% end %>
     </div>