diff --git a/Neos.Neos/Classes/Domain/Repository/WorkspaceMetadataAndRoleRepository.php b/Neos.Neos/Classes/Domain/Repository/WorkspaceMetadataAndRoleRepository.php
index ba487eae2e..c5ce393682 100644
--- a/Neos.Neos/Classes/Domain/Repository/WorkspaceMetadataAndRoleRepository.php
+++ b/Neos.Neos/Classes/Domain/Repository/WorkspaceMetadataAndRoleRepository.php
@@ -360,4 +360,13 @@ public function findWorkspaceNameByUser(ContentRepositoryId $contentRepositoryId
         ]);
         return $workspaceName === false ? null : WorkspaceName::fromString($workspaceName);
     }
+
+    /**
+     * @param \Closure(): void $fn
+     * @return void
+     */
+    public function transactional(\Closure $fn): void
+    {
+        $this->dbal->transactional($fn);
+    }
 }
diff --git a/Neos.Neos/Classes/Domain/Service/WorkspaceService.php b/Neos.Neos/Classes/Domain/Service/WorkspaceService.php
index 578f39b7a2..00ac32de62 100644
--- a/Neos.Neos/Classes/Domain/Service/WorkspaceService.php
+++ b/Neos.Neos/Classes/Domain/Service/WorkspaceService.php
@@ -132,10 +132,13 @@ public function createRootWorkspace(ContentRepositoryId $contentRepositoryId, Wo
                 ContentStreamId::create()
             )
         );
-        $this->metadataAndRoleRepository->addWorkspaceMetadata($contentRepositoryId, $workspaceName, $title, $description, WorkspaceClassification::ROOT, ownerUserId: null);
-        foreach ($assignments as $assignment) {
-            $this->metadataAndRoleRepository->assignWorkspaceRole($contentRepositoryId, $workspaceName, $assignment);
-        }
+
+        $this->metadataAndRoleRepository->transactional(function () use ($contentRepositoryId, $workspaceName, $title, $description, $assignments) {
+            $this->metadataAndRoleRepository->addWorkspaceMetadata($contentRepositoryId, $workspaceName, $title, $description, WorkspaceClassification::ROOT, ownerUserId: null);
+            foreach ($assignments as $assignment) {
+                $this->metadataAndRoleRepository->assignWorkspaceRole($contentRepositoryId, $workspaceName, $assignment);
+            }
+        });
     }
 
     /**
@@ -182,10 +185,13 @@ public function createSharedWorkspace(ContentRepositoryId $contentRepositoryId,
                 ContentStreamId::create()
             )
         );
-        $this->metadataAndRoleRepository->addWorkspaceMetadata($contentRepositoryId, $workspaceName, $title, $description, WorkspaceClassification::SHARED, ownerUserId: null);
-        foreach ($assignments as $assignment) {
-            $this->metadataAndRoleRepository->assignWorkspaceRole($contentRepositoryId, $workspaceName, $assignment);
-        }
+
+        $this->metadataAndRoleRepository->transactional(function () use ($contentRepositoryId, $workspaceName, $title, $description, $assignments) {
+            $this->metadataAndRoleRepository->addWorkspaceMetadata($contentRepositoryId, $workspaceName, $title, $description, WorkspaceClassification::SHARED, ownerUserId: null);
+            foreach ($assignments as $assignment) {
+                $this->metadataAndRoleRepository->assignWorkspaceRole($contentRepositoryId, $workspaceName, $assignment);
+            }
+        });
     }
 
     /**