diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/ReturnTypeParser.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/ReturnTypeParser.java
index f12218bf1..990063cc2 100644
--- a/springdoc-openapi-common/src/main/java/org/springdoc/core/ReturnTypeParser.java
+++ b/springdoc-openapi-common/src/main/java/org/springdoc/core/ReturnTypeParser.java
@@ -151,7 +151,7 @@ static void findTypeForGenerics(Class<?>[] generics, Type[] typeArguments, Resol
 	 */
 	static ResolvableType resolveVariable(TypeVariable<?> typeVariable, ResolvableType contextType) {
 		ResolvableType resolvedType;
-		if (contextType.hasGenerics()) {
+		if (contextType.hasGenerics() && contextType.getRawClass().equals(typeVariable.getGenericDeclaration())){
 			resolvedType = ResolvableType.forType(typeVariable, contextType);
 			if (resolvedType.resolve() != null) {
 				return resolvedType;