diff --git a/lib/gitlab/cycle_analytics/base_event_fetcher.rb b/lib/gitlab/cycle_analytics/base_event_fetcher.rb
index 0b8d5089a5b..6a169536e76 100644
--- a/lib/gitlab/cycle_analytics/base_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/base_event_fetcher.rb
@@ -70,6 +70,10 @@ module Gitlab
       def allowed_ids_source
         { project_id: @project.id }
       end
+
+      def projects
+        [@project]
+      end
     end
   end
 end
diff --git a/lib/gitlab/cycle_analytics/usage_data.rb b/lib/gitlab/cycle_analytics/usage_data.rb
index c5740f5c067..0ff2d34ea44 100644
--- a/lib/gitlab/cycle_analytics/usage_data.rb
+++ b/lib/gitlab/cycle_analytics/usage_data.rb
@@ -33,6 +33,7 @@ module Gitlab
       def medians_per_stage
         projects.each_with_object({}) do |project, hsh|
           ::CycleAnalytics::ProjectLevel.new(project: project, options: options).all_medians_per_stage.each do |stage_name, median|
+            hsh[stage_name] ||= []
             hsh[stage_name] << median
           end
         end