diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index 38188b472c8..8cfc73daf8f 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -377,7 +377,12 @@ private function addInheritedFields(ClassMetadata $subClass, ClassMetadata $pare
     private function addInheritedRelations(ClassMetadata $subClass, ClassMetadata $parentClass): void
     {
         foreach ($parentClass->associationMappings as $field => $mapping) {
-            if ($parentClass->isMappedSuperclass) {
+            if (! isset($mapping['declared'])) {
+                $mapping['declared'] = $parentClass->name;
+            }
+
+            $declaredInParent = $mapping['declared'] === $parentClass->name;
+            if ($parentClass->isMappedSuperclass && $declaredInParent) {
                 if ($mapping['type'] & ClassMetadata::TO_MANY && ! $mapping['isOwningSide']) {
                     throw MappingException::illegalToManyAssociationOnMappedSuperclass($parentClass->name, $field);
                 }
@@ -390,10 +395,6 @@ private function addInheritedRelations(ClassMetadata $subClass, ClassMetadata $p
                 $mapping['inherited'] = $parentClass->name;
             }
 
-            if (! isset($mapping['declared'])) {
-                $mapping['declared'] = $parentClass->name;
-            }
-
             $subClass->addInheritedAssociationMapping($mapping);
         }
     }
diff --git a/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/InvalidToManyOnMappedSuperclass/ChildMappedSuperclass.php b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/InvalidToManyOnMappedSuperclass/ChildMappedSuperclass.php
new file mode 100644
index 00000000000..ce439b35253
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/InvalidToManyOnMappedSuperclass/ChildMappedSuperclass.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\InvalidToManyOnMappedSuperclass;
+
+use Doctrine\ORM\Mapping\MappedSuperclass;
+use Doctrine\ORM\Mapping\OneToMany;
+use Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\RootEntity;
+
+/**
+ * @MappedSuperclass
+ */
+abstract class ChildMappedSuperclass extends RootEntity
+{
+    /**
+     * @var InvalidAssociatedEntity
+     * @OneToMany(targetEntity=InvalidAssociatedEntity::class, mappedBy="childMappedSuperclass")
+     */
+    private $invalidToManyAssociation;
+}
diff --git a/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/InvalidToManyOnMappedSuperclass/GrandchildMappedSuperclass.php b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/InvalidToManyOnMappedSuperclass/GrandchildMappedSuperclass.php
new file mode 100644
index 00000000000..060da16eacd
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/InvalidToManyOnMappedSuperclass/GrandchildMappedSuperclass.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\InvalidToManyOnMappedSuperclass;
+
+use Doctrine\ORM\Mapping\MappedSuperclass;
+
+/**
+ * @MappedSuperclass
+ */
+abstract class GrandchildMappedSuperclass extends ChildMappedSuperclass
+{
+}
diff --git a/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/InvalidToManyOnMappedSuperclass/GreatGrandchildEntity.php b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/InvalidToManyOnMappedSuperclass/GreatGrandchildEntity.php
new file mode 100644
index 00000000000..ce9823a0d2b
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/InvalidToManyOnMappedSuperclass/GreatGrandchildEntity.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\InvalidToManyOnMappedSuperclass;
+
+use Doctrine\ORM\Mapping\Entity;
+
+/**
+ * @Entity
+ */
+class GreatGrandchildEntity extends GrandchildMappedSuperclass
+{
+}
diff --git a/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/InvalidToManyOnMappedSuperclass/InvalidAssociatedEntity.php b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/InvalidToManyOnMappedSuperclass/InvalidAssociatedEntity.php
new file mode 100644
index 00000000000..b00f18ab638
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/InvalidToManyOnMappedSuperclass/InvalidAssociatedEntity.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\InvalidToManyOnMappedSuperclass;
+
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\Entity;
+use Doctrine\ORM\Mapping\GeneratedValue;
+use Doctrine\ORM\Mapping\Id;
+use Doctrine\ORM\Mapping\ManyToOne;
+
+/**
+ * @Entity
+ */
+class InvalidAssociatedEntity
+{
+    /**
+     * @var int
+     * @Column(type="integer")
+     * @Id
+     * @GeneratedValue
+     */
+    public $id;
+
+    /**
+     * @var ChildMappedSuperclass
+     * @ManyToOne(targetEntity=ChildMappedSuperclass::class, inversedBy="invalidToManyAssociation")
+     */
+    private $childMappedSuperclass;
+}
diff --git a/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/RootEntity.php b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/RootEntity.php
new file mode 100644
index 00000000000..da0c1a83147
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/RootEntity.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation;
+
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\DiscriminatorMap;
+use Doctrine\ORM\Mapping\Entity;
+use Doctrine\ORM\Mapping\GeneratedValue;
+use Doctrine\ORM\Mapping\Id;
+use Doctrine\ORM\Mapping\InheritanceType;
+use Doctrine\ORM\Mapping\OneToMany;
+use Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\ValidToManyOnRoot\AssociatedEntity;
+
+/**
+ * @DiscriminatorMap({
+ *     "validToManyOnRoot" = ValidToManyOnRoot\GrandchildEntity::class,
+ *     "invalidToManyOnMappedSuperclass" = InvalidToManyOnMappedSuperclass\GreatGrandchildEntity::class,
+ *     "toOneOnMappedSuperclass" = ToOneOnMappedSuperclass\GreatGrandchildEntity::class
+ * })
+ * @Entity
+ * @InheritanceType("JOINED")
+ */
+class RootEntity
+{
+    /**
+     * @var int
+     * @Column(type="integer")
+     * @Id
+     * @GeneratedValue
+     */
+    public $id;
+
+    /**
+     * @var AssociatedEntity
+     * @OneToMany(targetEntity=AssociatedEntity::class, mappedBy="root")
+     */
+    public $toManyAssociation;
+}
diff --git a/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ToOneOnMappedSuperclass/AssociatedEntity.php b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ToOneOnMappedSuperclass/AssociatedEntity.php
new file mode 100644
index 00000000000..104bedc5554
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ToOneOnMappedSuperclass/AssociatedEntity.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\ToOneOnMappedSuperclass;
+
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\Entity;
+use Doctrine\ORM\Mapping\GeneratedValue;
+use Doctrine\ORM\Mapping\Id;
+use Doctrine\ORM\Mapping\OneToOne;
+
+/**
+ * @Entity
+ */
+class AssociatedEntity
+{
+    /**
+     * @var int
+     * @Column(type="integer")
+     * @Id
+     * @GeneratedValue
+     */
+    public $id;
+
+    /**
+     * @var ChildMappedSuperclass
+     * @OneToOne(targetEntity=ChildMappedSuperclass::class, inversedBy="toOneAssociation")
+     */
+    private $childMappedSuperclass;
+}
diff --git a/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ToOneOnMappedSuperclass/ChildMappedSuperclass.php b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ToOneOnMappedSuperclass/ChildMappedSuperclass.php
new file mode 100644
index 00000000000..e5808a30890
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ToOneOnMappedSuperclass/ChildMappedSuperclass.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\ToOneOnMappedSuperclass;
+
+use Doctrine\ORM\Mapping\MappedSuperclass;
+use Doctrine\ORM\Mapping\OneToOne;
+use Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\RootEntity;
+
+/**
+ * @MappedSuperclass
+ */
+abstract class ChildMappedSuperclass extends RootEntity
+{
+    /**
+     * @var AssociatedEntity
+     * @OneToOne(targetEntity=AssociatedEntity::class, mappedBy="childMappedSuperclass")
+     */
+    private $toOneAssociation;
+}
diff --git a/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ToOneOnMappedSuperclass/GrandchildMappedSuperclass.php b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ToOneOnMappedSuperclass/GrandchildMappedSuperclass.php
new file mode 100644
index 00000000000..f06bbbe79da
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ToOneOnMappedSuperclass/GrandchildMappedSuperclass.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\ToOneOnMappedSuperclass;
+
+use Doctrine\ORM\Mapping\MappedSuperclass;
+
+/**
+ * @MappedSuperclass
+ */
+abstract class GrandchildMappedSuperclass extends ChildMappedSuperclass
+{
+}
diff --git a/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ToOneOnMappedSuperclass/GreatGrandchildEntity.php b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ToOneOnMappedSuperclass/GreatGrandchildEntity.php
new file mode 100644
index 00000000000..935f3f142e8
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ToOneOnMappedSuperclass/GreatGrandchildEntity.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\ToOneOnMappedSuperclass;
+
+use Doctrine\ORM\Mapping\Entity;
+
+/**
+ * @Entity
+ */
+class GreatGrandchildEntity extends GrandchildMappedSuperclass
+{
+}
diff --git a/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ValidToManyOnRoot/AssociatedEntity.php b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ValidToManyOnRoot/AssociatedEntity.php
new file mode 100644
index 00000000000..c111a624576
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ValidToManyOnRoot/AssociatedEntity.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\ValidToManyOnRoot;
+
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\Entity;
+use Doctrine\ORM\Mapping\GeneratedValue;
+use Doctrine\ORM\Mapping\Id;
+use Doctrine\ORM\Mapping\ManyToOne;
+use Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\RootEntity;
+
+/**
+ * @Entity
+ */
+class AssociatedEntity
+{
+    /**
+     * @var int
+     * @Column(type="integer")
+     * @Id
+     * @GeneratedValue
+     */
+    public $id;
+
+    /**
+     * @var RootEntity
+     * @ManyToOne(targetEntity=RootEntity::class, inversedBy="toManyAssociation")
+     */
+    private $root;
+}
diff --git a/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ValidToManyOnRoot/ChildMappedSuperclass.php b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ValidToManyOnRoot/ChildMappedSuperclass.php
new file mode 100644
index 00000000000..f44b2137ae5
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ValidToManyOnRoot/ChildMappedSuperclass.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\ValidToManyOnRoot;
+
+use Doctrine\ORM\Mapping\MappedSuperclass;
+use Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\RootEntity;
+
+/**
+ * @MappedSuperclass
+ */
+abstract class ChildMappedSuperclass extends RootEntity
+{
+}
diff --git a/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ValidToManyOnRoot/GrandchildEntity.php b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ValidToManyOnRoot/GrandchildEntity.php
new file mode 100644
index 00000000000..d8b17037f0d
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/JoinedInheritanceTypeWithAssociation/ValidToManyOnRoot/GrandchildEntity.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\ValidToManyOnRoot;
+
+use Doctrine\ORM\Mapping\Entity;
+
+/**
+ * @Entity
+ */
+class GrandchildEntity extends ChildMappedSuperclass
+{
+}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
index 32856d30c23..0c6753f8077 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
@@ -37,6 +37,10 @@
 use Doctrine\Tests\Models\JoinedInheritanceType\AnotherChildClass;
 use Doctrine\Tests\Models\JoinedInheritanceType\ChildClass;
 use Doctrine\Tests\Models\JoinedInheritanceType\RootClass;
+use Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\InvalidToManyOnMappedSuperclass;
+use Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\RootEntity;
+use Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\ToOneOnMappedSuperclass;
+use Doctrine\Tests\Models\JoinedInheritanceTypeWithAssociation\ValidToManyOnRoot;
 use Doctrine\Tests\Models\Quote;
 use Doctrine\Tests\OrmTestCase;
 use DoctrineGlobalArticle;
@@ -151,6 +155,47 @@ public function testGetMetadataForThrowsExceptionOnMissingCustomGeneratorDefinit
         $actual = $cmf->getMetadataFor($cm1->name);
     }
 
+    public function testGetMetadataForJoinedSuperclassWithToManyAssociationAndChildMappedSuperclass(): void
+    {
+        $cmf    = new ClassMetadataFactory();
+        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/JoinedInheritanceType/']);
+        $em     = $this->createEntityManager($driver);
+        $cmf->setEntityManager($em);
+
+        $rootMetadata       = $cmf->getMetadataFor(RootEntity::class);
+        $childMetadata      = $cmf->getMetadataFor(ValidToManyOnRoot\ChildMappedSuperclass::class);
+        $grandchildMetadata = $cmf->getMetadataFor(ValidToManyOnRoot\GrandchildEntity::class);
+
+        self::assertTrue($rootMetadata->hasAssociation('toManyAssociation'));
+        self::assertTrue($childMetadata->hasAssociation('toManyAssociation'));
+        self::assertTrue($grandchildMetadata->hasAssociation('toManyAssociation'));
+    }
+
+    public function testThrowsExceptionForToManyOnGrandparentMappedSuperclass(): void
+    {
+        $cmf    = new ClassMetadataFactory();
+        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/JoinedInheritanceType/']);
+        $em     = $this->createEntityManager($driver);
+        $cmf->setEntityManager($em);
+
+        $rootMetadata = $cmf->getMetadataFor(RootEntity::class);
+        self::expectException(MappingException::class);
+        $mappedSuperclass1Metadata = $cmf->getMetadataFor(InvalidToManyOnMappedSuperclass\ChildMappedSuperclass::class);
+        $mappedSuperclass2Metadata = $cmf->getMetadataFor(InvalidToManyOnMappedSuperclass\GrandchildMappedSuperclass::class);
+        $grandchildMetadata        = $cmf->getMetadataFor(InvalidToManyOnMappedSuperclass\GreatGrandchildEntity::class);
+    }
+
+    public function testInheritedNotSetForToOneOnGrandparentMappedSuperclass(): void
+    {
+        $cmf    = new ClassMetadataFactory();
+        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/JoinedInheritanceType/']);
+        $em     = $this->createEntityManager($driver);
+        $cmf->setEntityManager($em);
+
+        $grandchildMetadata = $cmf->getMetadataFor(ToOneOnMappedSuperclass\GreatGrandchildEntity::class);
+        self::assertFalse($grandchildMetadata->isInheritedAssociation('toOneAssociation'));
+    }
+
     public function testHasGetMetadataNamespaceSeparatorIsNotNormalized(): void
     {
         require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php';