diff --git a/ddpui/management/commands/manage-transform-tasks.py b/ddpui/management/commands/manage-transform-tasks.py
index b258d1f3..fa5fcf9b 100644
--- a/ddpui/management/commands/manage-transform-tasks.py
+++ b/ddpui/management/commands/manage-transform-tasks.py
@@ -108,6 +108,7 @@ def remove_dbt_docs_generate_from_current_pipelines(self, org: Org):
             DataflowOrgTask.objects.filter(
                 orgtask__task__slug=TASK_DOCSGENERATE,
                 dataflow__dataflow_type="orchestrate",
+                dataflow__org=org,
             ).count()
             == 0
         ), "Some mappings still exist for dbt-docs-generate task"