diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
index d26fb0194..f0fc8c4c5 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
@@ -176,6 +176,7 @@ public class EntityManagerImpl
         assertNotCloseInvoked();
         _broker.lock();
         try {
+            _plans.remove(_broker.getFetchConfiguration());
             _broker.popFetchConfiguration();
         } finally {
             _broker.unlock();