diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index e4adc4f0a..e6c46cd4d 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -173,7 +173,7 @@ class StatusMessage < Post
 
   private
   def self.tag_stream(tag_ids)
-    joins(:tags).where(:tags => {:id => tag_ids})
+    joins(:taggings).where('taggings.tag_id IN (?)', tag_ids)
   end
 end