diff --git a/lib/gitlab/usage_data_counters/hll_redis_counter.rb b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
index e71061c45227f988419cfaf2ff4e3e0ca0c974e4..09947bde51d90cdb8063bb8b1fedb1126e981efe 100644
--- a/lib/gitlab/usage_data_counters/hll_redis_counter.rb
+++ b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
@@ -113,7 +113,9 @@ def keys_for_aggregation(events:, start_date:, end_date:, context: '')
 
         def load_events(wildcard)
           if Feature.enabled?(:use_metric_definitions_for_events_list)
-            events = Gitlab::Usage::MetricDefinition.not_removed.values.map do |d|
+            events = Gitlab::Usage::MetricDefinition.all.map do |d|
+              next unless d.available?
+
               d.attributes[:options] && d.attributes[:options][:events]
             end.flatten.compact.uniq