diff --git a/src/lib/Form/Processor/ContentFormProcessor.php b/src/lib/Form/Processor/ContentFormProcessor.php
index 849871a..a0c0a4d 100644
--- a/src/lib/Form/Processor/ContentFormProcessor.php
+++ b/src/lib/Form/Processor/ContentFormProcessor.php
@@ -126,7 +126,9 @@ public function processPublish(FormActionEvent $event)
         $event->setPayload('content', $content);
         $event->setPayload('is_new', $draft->contentInfo->isDraft());
 
-        $locationId = $referrerLocation !== null ? $referrerLocation->id : $content->contentInfo->mainLocationId;
+        $locationId = $referrerLocation !== null && $data instanceof ContentUpdateData
+            ? $referrerLocation->id
+            : $content->contentInfo->mainLocationId;
 
         $redirectUrl = $form['redirectUrlAfterPublish']->getData() ?: $this->router->generate(
             '_ez_content_view', [