diff --git a/Classes/Infrastructure/ContentRepository/ConflictsFactory.php b/Classes/Infrastructure/ContentRepository/ConflictsFactory.php
index 8bc0be74b6..acf407195c 100644
--- a/Classes/Infrastructure/ContentRepository/ConflictsFactory.php
+++ b/Classes/Infrastructure/ContentRepository/ConflictsFactory.php
@@ -114,8 +114,8 @@ private function createConflictFromCommandThatFailedDuringRebase(
 
         return new Conflict(
             key: $affectedNode
-                 ? $affectedNode->aggregateId->value
-                : 'command-' . $commandThatFailedDuringRebase->sequenceNumber->value,
+                ? $affectedNode->aggregateId->value
+                : Algorithms::generateUUID(),
             affectedSite: $affectedSite
                 ? $this->createIconLabelForNode($affectedSite)
                 : null,