diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/util/ClassTypeInformation.java b/spring-data-commons-core/src/main/java/org/springframework/data/util/ClassTypeInformation.java
index e7d0aa96d..33db8b261 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/util/ClassTypeInformation.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/util/ClassTypeInformation.java
@@ -60,6 +60,10 @@ public class ClassTypeInformation extends TypeDiscoverer {
    */
   @Override
   public TypeInformation getComponentType() {
+    
+    if (type.isArray()) {
+      return createInfo(type.getComponentType());
+    }
 
     TypeVariable<?>[] typeParameters = type.getTypeParameters();
     return typeParameters.length > 0 ? new TypeVariableTypeInformation(typeParameters[0], this.getType(), this) : null;