diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
index 41589161abd7..31ad68f820a1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
@@ -927,6 +927,12 @@ private FactoryBean<?> getSingletonFactoryBeanForTypeCheck(String beanName, Root
 			if (bw != null) {
 				return (FactoryBean<?>) bw.getWrappedInstance();
 			}
+
+			Object beanInstance = getSingleton(beanName, false);
+                        if (beanInstance != null) {
+                            return (FactoryBean<?>) beanInstance;
+                        }
+
 			if (isSingletonCurrentlyInCreation(beanName) ||
 					(mbd.getFactoryBeanName() != null && isSingletonCurrentlyInCreation(mbd.getFactoryBeanName()))) {
 				return null;