diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/GatewayProxyInstantiationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/GatewayProxyInstantiationPostProcessor.java
index 9813df8f06..d5e15aa9f7 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/GatewayProxyInstantiationPostProcessor.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/GatewayProxyInstantiationPostProcessor.java
@@ -88,7 +88,7 @@ class GatewayProxyInstantiationPostProcessor implements
 		if (beanClass.isInterface() && AnnotatedElementUtils.hasAnnotation(beanClass, MessagingGateway.class)) {
 			RootBeanDefinition beanDefinition = registeredBean.getMergedBeanDefinition();
 			beanDefinition.setBeanClass(AnnotationGatewayProxyFactoryBean.class);
-			beanDefinition.getConstructorArgumentValues().addGenericArgumentValue(beanClass);
+			beanDefinition.getConstructorArgumentValues().addIndexedArgumentValue(0, beanClass);
 			beanDefinition.setTargetType(
 					ResolvableType.forClassWithGenerics(AnnotationGatewayProxyFactoryBean.class, beanClass));
 		}