diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
index de132349369..c41a67b73df 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
@@ -230,12 +230,14 @@ abstract class AnnotationsScanner {
 				return superclassResult;
 			}
 		}
-		Class<?> enclosingClass = source.getEnclosingClass();
-		if (includeEnclosing && enclosingClass != null) {
-			R enclosingResult = processClassHierarchy(context, aggregateIndex,
+		if (includeEnclosing) {
+			Class<?> enclosingClass = source.getEnclosingClass();
+			if (enclosingClass != null) {
+				R enclosingResult = processClassHierarchy(context, aggregateIndex,
 					enclosingClass, processor, classFilter, includeInterfaces, true);
-			if (enclosingResult != null) {
-				return enclosingResult;
+				if (enclosingResult != null) {
+					return enclosingResult;
+				}
 			}
 		}
 		return null;