diff --git a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/IntegrationRSocketMessageHandler.java b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/IntegrationRSocketMessageHandler.java
index 249d35b1d9..797f1466c3 100644
--- a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/IntegrationRSocketMessageHandler.java
+++ b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/IntegrationRSocketMessageHandler.java
@@ -68,8 +68,6 @@ class IntegrationRSocketMessageHandler extends RSocketMessageHandler {
 	}
 
 	public void addEndpoint(IntegrationRSocketEndpoint endpoint) {
-		// TODO temporary until routeMatcher initialization is moved to aPS()
-		setRouteMatcher(getRSocketStrategies().routeMatcher());
 		registerHandlerMethod(endpoint, HANDLE_MESSAGE_METHOD,
 				new CompositeMessageCondition(
 						RSocketFrameTypeMessageCondition.REQUEST_CONDITION,
diff --git a/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGatewayIntegrationTests.java b/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGatewayIntegrationTests.java
index 881c208def..3d52642c1a 100644
--- a/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGatewayIntegrationTests.java
+++ b/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGatewayIntegrationTests.java
@@ -24,7 +24,6 @@ import java.util.Collections;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 
@@ -83,7 +82,6 @@ import reactor.test.StepVerifier;
  */
 @SpringJUnitConfig(RSocketOutboundGatewayIntegrationTests.ClientConfig.class)
 @DirtiesContext
-@Disabled // TODO temporary until routeMatcher initialization is moved to aPS()
 public class RSocketOutboundGatewayIntegrationTests {
 
 	private static final String ROUTE_HEADER = "rsocket_route";