diff --git a/db/up/find_sessions_2020.sql b/db/up/find_sessions_2020.sql
index d49f12173..b2b9a0b03 100644
--- a/db/up/find_sessions_2020.sql
+++ b/db/up/find_sessions_2020.sql
@@ -75,6 +75,8 @@ ALTER TABLE users ADD COLUMN is_platform_instructor BOOLEAN NOT NULL DEFAULT FAL
 ALTER TABLE users ADD COLUMN import_source varchar(50);
 ALTER TABLE users ADD COLUMN license_start date;
 ALTER TABLE users ADD COLUMN license_end date;
+
+
 CREATE INDEX users_is_a_student_idx ON users((1)) WHERE is_a_student;
 CREATE INDEX users_is_a_teacher_idx ON users((1)) WHERE is_a_teacher;
 CREATE INDEX users_is_platform_instructor_idx ON users((1)) WHERE is_platform_instructor;
diff --git a/ruby/lib/jam_ruby/models/chat_message.rb b/ruby/lib/jam_ruby/models/chat_message.rb
index 3d1880c61..07baa73f0 100644
--- a/ruby/lib/jam_ruby/models/chat_message.rb
+++ b/ruby/lib/jam_ruby/models/chat_message.rb
@@ -107,6 +107,11 @@ module JamRuby
       @@message_factory = MessageFactory.new
 
       def index(user, params = {})
+        # TODO: school user scan't see chat
+        if params[:channel] == 'global' && !user.school_id.nil?
+          return [[], nil]
+        end
+
         limit = params[:limit]
         limit ||= 20
         limit = limit.to_i
diff --git a/ruby/lib/jam_ruby/models/search.rb b/ruby/lib/jam_ruby/models/search.rb
index 129fb2b03..132addef4 100644
--- a/ruby/lib/jam_ruby/models/search.rb
+++ b/ruby/lib/jam_ruby/models/search.rb
@@ -136,6 +136,11 @@ module JamRuby
         rel
       end
 
+      def scope_schools_together_chats(rel, user)
+        # TODO:
+        return rel
+      end
+
 
       def scope_schools_together_sessions(rel, user, table_name = 'active_music_sessions')
         if user.nil?