1 files changed, 9 insertions, 1 deletions
diff --git a/app/graphql/resolvers/work_items/types_resolver.rb b/app/graphql/resolvers/work_items/types_resolver.rb
index 67a9d57d42f..5f9f8ab5572 100644
--- a/app/graphql/resolvers/work_items/types_resolver.rb
+++ b/app/graphql/resolvers/work_items/types_resolver.rb
@@ -11,7 +11,7 @@ module Resolvers
                             ' Argument is experimental and can be removed in the future without notice.'
 
       def resolve(taskable: nil)
-        return unless Feature.enabled?(:work_items, object, default_enabled: :yaml)
+        return unless feature_flag_enabled_for_parent?(object)
 
         # This will require a finder in the future when groups/projects get their work item types
         # All groups/projects use the default types for now
@@ -20,6 +20,14 @@ module Resolvers
 
         base_scope.order_by_name_asc
       end
+
+      private
+
+      def feature_flag_enabled_for_parent?(parent)
+        return false unless parent.is_a?(::Project) || parent.is_a?(::Group)
+
+        parent.work_items_feature_flag_enabled?
+      end
     end
   end
 end