diff --git a/views/item-partial.html b/views/item-partial.html
index 6d02905..6f0127f 100644
--- a/views/item-partial.html
+++ b/views/item-partial.html
@@ -125,9 +125,9 @@
             @endif
     </div>
 </div>
-<div id="comments-container" data-item-id="{{ item.id }}" @if(session)data-user="{{ session.user }}"
-    @if(session.admin)data-is-admin="true" @endif @else style="display:none" @endif
-    @if(item.is_comments_locked)data-is-locked="true" @endif>
+@if(session && session.user)
+<div id="comments-container" data-item-id="{{ item.id }}" data-user="{{ session.user }}"
+    @if(session.admin)data-is-admin="true" @endif @if(item.is_comments_locked)data-is-locked="true" @endif>
     <div class="comments-header">
         <span>Comments (@if(comments){{ comments.length }}@else 0 @endif) @if(item.is_comments_locked)🔒@endif</span>
         <div class="comments-controls">
@@ -139,6 +139,9 @@
         <textarea disabled></textarea>
     </div>
     @endif
+    @endif
 </div>
+@if(session && session.user)
 <script id="initial-comments" type="application/json">{{ commentsJSON }}</script>
+@endif
 <script id="initial-subscription" type="application/json">{{ isSubscribed }}</script>
\ No newline at end of file