diff --git a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
index 06828e270da..0eef114fab8 100755
--- a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
+++ b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
@@ -204,7 +204,7 @@ public function updateSiteAction(Site $site, $newSiteNodeName)
             }
 
             foreach ($contentRepository->getWorkspaceFinder()->findAll() as $workspace) {
-                $siteNodeAggregate = $contentRepository->getContentGraph(WorkspaceName::forLive())->findChildNodeAggregateByName(
+                $siteNodeAggregate = $contentRepository->getContentGraph($workspace->workspaceName)->findChildNodeAggregateByName(
                     $sitesNode->nodeAggregateId,
                     $site->getNodeName()->toNodeName()
                 );
diff --git a/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php b/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php
index 062e7ea8f18..ae5d75bb1e5 100644
--- a/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php
+++ b/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php
@@ -30,7 +30,6 @@
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeVariantSelectionStrategy;
-use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 use Neos\Neos\Domain\Exception\SiteNodeTypeIsInvalid;
 use Neos\Neos\Domain\Model\Site;
 use Neos\Neos\Domain\Model\SiteNodeName;
@@ -96,10 +95,11 @@ public function createSiteNodeIfNotExists(Site $site, string $nodeTypeName): voi
             throw SiteNodeTypeIsInvalid::becauseItIsNotOfTypeSite(NodeTypeName::fromString($nodeTypeName));
         }
 
-        $siteNodeAggregate = $this->contentRepository->getContentGraph(WorkspaceName::forLive())->findChildNodeAggregateByName(
-            $sitesNodeIdentifier,
-            $site->getNodeName()->toNodeName(),
-        );
+        $siteNodeAggregate = $this->contentRepository->getContentGraph($liveWorkspace->workspaceName)
+            ->findChildNodeAggregateByName(
+                $sitesNodeIdentifier,
+                $site->getNodeName()->toNodeName(),
+            );
         if ($siteNodeAggregate instanceof NodeAggregate) {
             // Site node already exists
             return;