diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index 7269238c1..0695cdbdf 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -116,14 +116,14 @@ class StatusMessage < Post
 
   def update_and_dispatch_attached_photos(sender)
     if self.photos.any?
-      self.photos.update_all(:public => self.public)
+      Photo.where(status_message_guid: guid).update_all(:public => self.public)
       self.photos.each do |photo|
         if photo.pending
           sender.add_to_streams(photo, self.aspects)
           sender.dispatch_post(photo)
         end
       end
-      self.photos.update_all(:pending => false)
+      Photo.where(status_message_guid: guid).update_all(:pending => false)
     end
   end