diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
index 384c2cbc49..6d8c27708b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
@@ -1030,7 +1030,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 			}
 		}
 		finally {
-			this.preInstantiationThread.set(null);
+			this.preInstantiationThread.remove();
 		}
 		if (!futures.isEmpty()) {
 			try {
@@ -1100,7 +1100,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 			throw ex;
 		}
 		finally {
-			this.preInstantiationThread.set(null);
+			this.preInstantiationThread.remove();
 		}
 	}