diff --git a/Classes/Domain/Repository/PostRepository.php b/Classes/Domain/Repository/PostRepository.php
index 106dce2f..de8ac6d0 100644
--- a/Classes/Domain/Repository/PostRepository.php
+++ b/Classes/Domain/Repository/PostRepository.php
@@ -234,7 +234,11 @@ public function findCurrentPost(): ?Post
         if ($storagePidConstraint instanceof ComparisonInterface) {
             $constraints[] = $storagePidConstraint;
         }
-        $constraints[] = $query->equals('uid', $pageId);
+        if ((int)GeneralUtility::makeInstance(Context::class)->getPropertyFromAspect('language', 'id', 0) > 0) {
+            $constraints[] = $query->equals('l10n_parent', $pageId);
+        } else {
+            $constraints[] = $query->equals('uid', $pageId);
+        }
 
         /** @var Post $post */
         $post = $query