diff --git a/internal/template/templates/views/entry.html b/internal/template/templates/views/entry.html
index 490600ed..8381da79 100644
--- a/internal/template/templates/views/entry.html
+++ b/internal/template/templates/views/entry.html
@@ -135,7 +135,14 @@
         {{ if .entry.Tags }}
         <div class="entry-tags">
             {{ t "entry.tags.label" }}
-	    {{range $i, $e := .entry.Tags}}{{if $i}}, {{end}}<a href="{{ route "tagEntriesAll" "tagName" (urlEncode $e) }}"><strong>{{ $e }}</strong></a>{{end}}
+            {{ range $i, $e := .entry.Tags }}
+                {{if $i}}, {{end}}
+                {{ if $.user }}
+                    <a href="{{ route "tagEntriesAll" "tagName" (urlEncode $e) }}"><strong>{{ $e }}</strong></a>
+                {{ else }}
+                    <strong>{{ $e }}</strong>
+                {{ end }}
+            {{ end }}
         </div>
         {{ end }}
         <div class="entry-date">