diff --git a/src/main/java/org/springframework/data/util/ParameterizedTypeInformation.java b/src/main/java/org/springframework/data/util/ParameterizedTypeInformation.java
index 762d567ef..8c6f62908 100644
--- a/src/main/java/org/springframework/data/util/ParameterizedTypeInformation.java
+++ b/src/main/java/org/springframework/data/util/ParameterizedTypeInformation.java
@@ -166,7 +166,20 @@ class ParameterizedTypeInformation<T> extends ParentTypeAwareTypeInformation<T>
 	@Override
 	@SuppressWarnings("unchecked")
 	public TypeInformation<? extends T> specialize(ClassTypeInformation<?> type) {
-		return isResolvedCompletely() ? (TypeInformation<? extends T>) type : super.specialize(type);
+
+		if (isResolvedCompletely()) {
+			return (TypeInformation<? extends T>) type;
+		}
+
+		TypeInformation<?> asSupertype = type.getSuperTypeInformation(getType());
+
+		if (asSupertype == null || !ParameterizedTypeInformation.class.isInstance(asSupertype)) {
+			return super.specialize(type);
+		}
+
+		return ((ParameterizedTypeInformation<?>) asSupertype).isResolvedCompletely() //
+				? (TypeInformation<? extends T>) type //
+				: super.specialize(type);
 	}
 
 	/*
diff --git a/src/main/java/org/springframework/data/util/TypeDiscoverer.java b/src/main/java/org/springframework/data/util/TypeDiscoverer.java
index aad143b30..8ef54480a 100644
--- a/src/main/java/org/springframework/data/util/TypeDiscoverer.java
+++ b/src/main/java/org/springframework/data/util/TypeDiscoverer.java
@@ -485,13 +485,15 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
 	@SuppressWarnings("unchecked")
 	public TypeInformation<? extends S> specialize(ClassTypeInformation<?> type) {
 
+		Assert.notNull(type, "Type must not be null!");
 		Assert.isTrue(getType().isAssignableFrom(type.getType()),
-				String.format("%s must be assignable from %s", getType(), type.getType()));
+				() -> String.format("%s must be assignable from %s", getType(), type.getType()));
 
-		List<TypeInformation<?>> arguments = getTypeArguments();
+		List<TypeInformation<?>> typeArguments = getTypeArguments();
 
-		return (TypeInformation<? extends S>) (arguments.isEmpty() ? type
-				: createInfo(new SyntheticParamterizedType(type, arguments)));
+		return (TypeInformation<? extends S>) (typeArguments.isEmpty() //
+				? type //
+				: type.createInfo(new SyntheticParamterizedType(type, getTypeArguments())));
 	}
 
 	@Nullable