diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayInvokingMessageHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayInvokingMessageHandler.java
index 2b7639ac4d..c4d68a941f 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayInvokingMessageHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayInvokingMessageHandler.java
@@ -19,6 +19,7 @@ package org.springframework.integration.gateway;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
 import org.springframework.integration.message.MessageHandler;
+import org.springframework.integration.support.ComponentMetadata;
 import org.springframework.util.Assert;
 
 /**
@@ -29,9 +30,6 @@ import org.springframework.util.Assert;
  */
 public class GatewayInvokingMessageHandler extends AbstractReplyProducingMessageHandler {
 
-	public static final String COMPONENT_TYPE_LABEL = "gateway";
-
-
 	private GenericSendAndRecieveGateway gateway;
 
 	/**
@@ -42,6 +40,11 @@ public class GatewayInvokingMessageHandler extends AbstractReplyProducingMessage
 		this.gateway = gateway;
 	}
 
+	@Override
+	protected void populateComponentMetadata(ComponentMetadata metadata) {
+		metadata.setComponentType("gateway");
+	}
+
 	/**
 	 * Will simply delegate to the original gateway
 	 */