diff --git a/flink-java/src/main/java/org/apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java
index b7569ac4416c3bfe29fb1dcc4bb74924d78acf04..08022805fd084160950cf21ec953c00520a9c5dc 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java
@@ -116,7 +116,7 @@ public class ObjectArrayTypeInfo<T, C> extends TypeInformation<T> {
 			return new ObjectArrayTypeInfo<T, C>(type, genericArray.getGenericComponentType(), componentInfo);
 		}
 		// for tuples without generics (e.g. generated by the TypeInformation parser)
-		else if (type instanceof Class<?> && ((Class<?>) type).isArray() && Tuple.class.isAssignableFrom(((Class<?>) type).getComponentType())
+		else if (type instanceof Class<?> && ((Class<?>) type).isArray() && componentInfo.isTupleType()
 				&& type != Tuple.class) {
 			return new ObjectArrayTypeInfo<T, C>(type, ((Class<?>) type).getComponentType(), componentInfo);
 		}