diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb
index 2b67ea537..1e95a419a 100644
--- a/ruby/lib/jam_ruby/models/user.rb
+++ b/ruby/lib/jam_ruby/models/user.rb
@@ -310,8 +310,9 @@ module JamRuby
     scope :not_deleted, ->{ where(deleted: false) }
 
     def self.lobby(current_user, options = {})
-      query = User.where("users.id <> ? AND users.last_jam_updated_at > ?", current_user.id, 15.minutes.ago)
-      if live_music_sessions = ActiveMusicSession.count > 0
+      query = User.where("users.id <> ? AND last_jam_updated_at IS NOT NULL AND users.last_jam_updated_at > ?", current_user.id, 15.minutes.ago)
+      live_music_sessions = ActiveMusicSession
+      if live_music_sessions.count > 0
         query = query.where("users.id NOT IN (?)", live_music_sessions.pluck(:user_id))
       end
       query
diff --git a/web/app/assets/javascripts/modern/JamServer_copy.js b/web/app/assets/javascripts/modern/JamServer_copy.js
index 60bdffef5..bad59e74f 100644
--- a/web/app/assets/javascripts/modern/JamServer_copy.js
+++ b/web/app/assets/javascripts/modern/JamServer_copy.js
@@ -317,8 +317,8 @@
     }
 
     function activityCheck() {
-      //var timeoutTime = 300000; // 5 * 1000 * 60 , 5 minutes
-      var timeoutTime = 2000; // 5 * 1000 * 60 , 5 minutes
+      var timeoutTime = 300000; // 5 * 1000 * 60 , 5 minutes
+      //var timeoutTime = 2000;
       active = true;
       setActive(active)
       activityTimeout = setTimeout(markAway, timeoutTime);