typo3/sysext/frontend/Classes/Typolink/PageLinkBuilder.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/typo3/sysext/frontend/Classes/Typolink/PageLinkBuilder.php b/typo3/sysext/frontend/Classes/Typolink/PageLinkBuilder.php
index 864bf12f4f..38c4881d66 100644
--- a/typo3/sysext/frontend/Classes/Typolink/PageLinkBuilder.php
+++ b/typo3/sysext/frontend/Classes/Typolink/PageLinkBuilder.php
@@ -350,6 +350,10 @@ class PageLinkBuilder extends AbstractTypolinkBuilder
         try {
             $siteLanguageOfTargetPage = $siteOfTargetPage->getLanguageById($targetLanguageId);
         } catch (\InvalidArgumentException $e) {
+            if ($siteOfTargetPage->getIdentifier() !== $currentSite->getIdentifier()) {
+                $siteLanguageOfTargetPage = $siteOfTargetPage->getLanguageById(0);
+                return $siteLanguageOfTargetPage;
+            }
             throw new UnableToLinkException('The target page does not have a language with ID ' . $targetLanguageId . ' configured in its site configuration.', 1535477406);
         }
         return $siteLanguageOfTargetPage;