1 files changed, 6 insertions, 0 deletions
diff --git a/lib/api/groups.rb b/lib/api/groups.rb
index 6b1fc0d4279..ca99e30fbf7 100644
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -123,6 +123,12 @@ module API
       end
 
       def present_groups_with_pagination_strategies(params, groups)
+        # Prevent Rails from optimizing the count query and inadvertadly creating a poor performing databse query.
+        # https://gitlab.com/gitlab-org/gitlab/-/issues/368969
+        if Feature.enabled?(:present_groups_select_all)
+          groups = groups.select(groups.arel_table[Arel.star])
+        end
+
         return present_groups(params, groups) if current_user.present?
 
         options = {