diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/SubtreeTagging.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/SubtreeTagging.php
index 251b4d160d2..8a04dd2fa37 100644
--- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/SubtreeTagging.php
+++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/SubtreeTagging.php
@@ -43,6 +43,8 @@ private function addSubtreeTag(ContentStreamId $contentStreamId, NodeAggregateId
                 FROM
                   cte
                   JOIN {$this->tableNames->hierarchyRelation()} dh ON dh.parentnodeanchor = cte.id
+                    AND dh.contentstreamid = :contentStreamId
+                    AND dh.dimensionspacepointhash in (:dimensionSpacePointHashes)
                 WHERE
                   NOT JSON_CONTAINS_PATH(dh.subtreetags, 'one', :tagPath)
               )
@@ -119,7 +121,9 @@ private function removeSubtreeTag(ContentStreamId $contentStreamId, NodeAggregat
                   dh.childnodeanchor
                 FROM
                   cte
-                  JOIN {$this->tableNames->hierarchyRelation()} dh ON dh.parentnodeanchor = cte.id
+                  JOIN {$this->tableNames->hierarchyRelation()} dh ON dh.parentnodeanchor = cte.id 
+                    AND dh.contentstreamid = :contentStreamId
+                    AND dh.dimensionspacepointhash in (:dimensionSpacePointHashes)
                 WHERE
                   JSON_EXTRACT(dh.subtreetags, :tagPath) != TRUE
               )