diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index 4366250dd..e499d3c5f 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -2054,6 +2054,11 @@ class UnitOfWork implements PropertyChangedListener
             // Loading the entity right here, if its in the eager loading map get rid of it there.
             unset($this->eagerLoadingEntities[$class->rootEntityName][$idHash]);
             
+            if (isset($this->eagerLoadingEntities[$class->rootEntityName]) && 
+                ! $this->eagerLoadingEntities[$class->rootEntityName]) {
+                unset($this->eagerLoadingEntities[$class->rootEntityName]);
+            }
+            
             // Properly initialize any unfetched associations, if partial objects are not allowed.
             if ( ! isset($hints[Query::HINT_FORCE_PARTIAL_LOAD])) {
                 foreach ($class->associationMappings as $field => $assoc) {