diff --git a/src/lib/Form/Processor/ContentFormProcessor.php b/src/lib/Form/Processor/ContentFormProcessor.php
index f8d048b..b172621 100644
--- a/src/lib/Form/Processor/ContentFormProcessor.php
+++ b/src/lib/Form/Processor/ContentFormProcessor.php
@@ -126,12 +126,12 @@ public function processPublish(FormActionEvent $event)
         $event->setPayload('content', $content);
         $event->setPayload('is_new', $draft->contentInfo->isDraft());
 
+        $locationId = !empty($referrerLocation) ? $referrerLocation->id : $content->contentInfo->mainLocationId;
+
         $redirectUrl = $form['redirectUrlAfterPublish']->getData() ?: $this->router->generate(
             '_ez_content_view', [
                 'contentId' => $content->id,
-                'locationId' => !empty($referrerLocation)
-                    ? $referrerLocation->id
-                    : $content->contentInfo->mainLocationId,
+                'locationId' => $locationId,
             ]
         );