diff --git a/src/Doctrine/EntityRegenerator.php b/src/Doctrine/EntityRegenerator.php
index d72b65364..be1bbee41 100644
--- a/src/Doctrine/EntityRegenerator.php
+++ b/src/Doctrine/EntityRegenerator.php
@@ -88,6 +88,10 @@ public function regenerateEntities(string $classOrNamespace): void
 
                 $operations[$embeddedClasses[$fieldName]] = $this->createClassManipulator($embeddedClasses[$fieldName]);
 
+                if (!\in_array($fieldName, $mappedFields)) {
+                    continue;
+                }
+
                 $manipulator->addEmbeddedEntity($fieldName, $className);
             }
 
@@ -242,7 +246,8 @@ private function getMappedFieldsInEntity(ClassMetadata $classMetadata): array
 
         $targetFields = array_merge(
             array_keys($classMetadata->fieldMappings),
-            array_keys($classMetadata->associationMappings)
+            array_keys($classMetadata->associationMappings),
+            array_keys($classMetadata->embeddedClasses)
         );
 
         if ($classReflection) {