diff --git a/ruby/lib/jam_ruby/models/chat_message.rb b/ruby/lib/jam_ruby/models/chat_message.rb
index c02ed1d7b..028e2d411 100644
--- a/ruby/lib/jam_ruby/models/chat_message.rb
+++ b/ruby/lib/jam_ruby/models/chat_message.rb
@@ -27,7 +27,10 @@ module JamRuby
         start = params[:start].presence
         start = start.to_i || 0
 
-        query = ChatMessage.offset(start).limit(limit)
+        music_session_id = params[:music_session]
+
+        query = ChatMessage.where('music_session_id = ?', music_session_id)
+                           .offset(start).limit(limit)
 
         if query.length == 0
           [query, nil]