diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index c94cfb7a9..b423b4214 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -82,9 +82,9 @@
   - if @photo.status_message_id
     %div{:id => 'status_message_stream', :class => 'stream show'}
       %li.message{:data=>{:guid=>@photo.status_message_id}}
-        = render "comments/comments", :post => @photo.status_message
+        = render "comments/comments", :post_id => @photo.status_message.id, :comments => @photo.status_message.comments
 
   - else
     %div{:id => 'photo_stream', :class => 'stream show'}
       %li.message{:data=>{:guid=>@photo.id}}
-        = render "comments/comments", :post => @photo
+        = render "comments/comments", :post_id => @photo.id, :comments => @photo.comments
diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml
index 5aa7c9104..0fcaf3b4d 100644
--- a/app/views/status_messages/show.html.haml
+++ b/app/views/status_messages/show.html.haml
@@ -22,4 +22,4 @@
   %h4{:style=>"margin-bottom:5px;"}= t('_comments')
   %div{:class => 'stream show', :id => 'status_message_stream'}
     %li.message{:data=>{:guid=>@status_message.id}}
-      = render "comments/comments", :post => @status_message
+      = render "comments/comments", :post_id => @status_message.id, :comments => @status_message.comments