diff --git a/ee/app/models/ee/group.rb b/ee/app/models/ee/group.rb
index 62a2f594c363502afbcd6a693c369381a8f740bb..282aefdb2ac7e38ae13f36aea5ca7fd90364d770 100644
--- a/ee/app/models/ee/group.rb
+++ b/ee/app/models/ee/group.rb
@@ -258,9 +258,9 @@ def checked_file_template_project(*args, &blk)
     override :billable_members_count
     def billable_members_count(requested_hosted_plan = nil)
       if [actual_plan_name, requested_hosted_plan].include?(Plan::GOLD)
-        users_with_descendants.excluding_guests.count
+        direct_and_indirect_users.excluding_guests.count
       else
-        users_with_descendants.count
+        direct_and_indirect_users.count
       end
     end