diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index ee499a1a8..ab91b8bab 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -3468,16 +3468,14 @@ class UnitOfWork implements PropertyChangedListener
      */
     private function clearIdentityMapForEntityName($entityName)
     {
-        $visited = array();
+        if (! isset($this->identityMap[$entityName])) {
+            return;
+        }
 
-        foreach ($this->identityMap as $className => $entities) {
-            if ($className !== $entityName) {
-                continue;
-            }
+        $visited = [];
 
-            foreach ($entities as $entity) {
-                $this->doDetach($entity, $visited, false);
-            }
+        foreach ($this->identityMap[$entityName] as $entity) {
+            $this->doDetach($entity, $visited, false);
         }
     }