diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index c19c2ba34..1c869ca00 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -54,7 +54,7 @@
             = t('.via', :link => link_to("#{post.provider_display_name}", post.actor_url)).html_safe
             ·
 
-        - unless (defined?(@commenting_disabled) && @commenting_disabled)
+        - unless @commenting_disabled
           %span.like_action
             = like_action(post, current_user)
 
@@ -69,4 +69,4 @@
       .likes.on_post
         = render "likes/likes_container", :target_id => post.id, :likes_count => post.likes_count, :current_user => current_user, :target_type => "Post"
 
-      = render "comments/comments", :post => post, :current_user => current_user, :commenting_disabled => (defined?(@commenting_disabled) && @commenting_disabled)
+      = render "comments/comments", :post => post, :current_user => current_user, :commenting_disabled => @commenting_disabled