1 files changed, 8 insertions, 3 deletions
diff --git a/lib/gitlab/analytics/cycle_analytics/base_query_builder.rb b/lib/gitlab/analytics/cycle_analytics/base_query_builder.rb
index c7987d63153..ca8b4a3a890 100644
--- a/lib/gitlab/analytics/cycle_analytics/base_query_builder.rb
+++ b/lib/gitlab/analytics/cycle_analytics/base_query_builder.rb
@@ -57,9 +57,14 @@ module Gitlab
         end
 
         def add_parent_model_params!(finder_params)
-          raise(ArgumentError, "unknown parent_class: #{parent_class}") unless parent_class.eql?(Project)
-
-          finder_params[:project_id] = stage.parent_id
+          case stage.parent
+          when Namespaces::ProjectNamespace
+            finder_params[:project_id] = stage.parent.project.id
+          when Project
+            finder_params[:project_id] = stage.parent_id
+          else
+            raise(ArgumentError, "unknown parent_class: #{parent_class}")
+          end
         end
 
         def add_time_range_params!(finder_params, from, to)