diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml
index f81fe3ad..42ba0721 100644
--- a/app/views/events/show.html.haml
+++ b/app/views/events/show.html.haml
@@ -113,7 +113,7 @@
     %em.fa.fa-tags
     %span.label= Event.human_attribute_name :tags
     - @event.tags.each do |tag|
-      = link_to tag, tag_path(tag), rel: :tag
+      = link_to tag, tag_path(tag.name), rel: :tag
 
 - if @event.repeat > 0
   %h3
diff --git a/app/views/orgas/show.html.haml b/app/views/orgas/show.html.haml
index d5f2f992..bfcab4ce 100644
--- a/app/views/orgas/show.html.haml
+++ b/app/views/orgas/show.html.haml
@@ -110,7 +110,9 @@
     %dt
       %em.fa.fa-tags
       = Event.human_attribute_name :tags
-    %dd= @orga.tag_list
+    %dd
+      - @orga.tags.each do |tag|
+        = link_to tag, tag_path(tag.name), rel: :tag
   %dt
     %em.fa.fa-heartbeat
     = Orga.human_attribute_name :active