diff --git a/app/controllers/users/sidebars_controller.rb b/app/controllers/users/sidebars_controller.rb index 55f910ea2..eb4fe88b0 100644 --- a/app/controllers/users/sidebars_controller.rb +++ b/app/controllers/users/sidebars_controller.rb @@ -16,7 +16,7 @@ def extract_direct_memberships(all_memberships) def find_direct_placeholder_users exclude_user_ids = user_ids_already_in_direct_rooms_with_current_user.including(Current.user.id) - User.active.where.not(id: exclude_user_ids).order(:created_at).limit(DIRECT_PLACEHOLDERS - exclude_user_ids.count) + User.active.where.not(id: exclude_user_ids).order(:created_at).limit([DIRECT_PLACEHOLDERS - exclude_user_ids.count, 0].max) end def user_ids_already_in_direct_rooms_with_current_user