diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataEncoder.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataEncoder.java
index 5f153b3c39b2..52972be09a14 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataEncoder.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataEncoder.java
@@ -106,8 +106,7 @@ private static String expand(String route, Object... routeVars) {
 		Matcher matcher = VARS_PATTERN.matcher(route);
 		while (matcher.find()) {
 			Assert.isTrue(index < routeVars.length, () -> "No value for variable '" + matcher.group(1) + "'");
-			String value = routeVars[index].toString();
-			value = value.contains(".") ? value.replaceAll("\\.", "%2E") : value;
+			String value = routeVars[index].toString().replace(".", "%2E");
 			matcher.appendReplacement(sb, value);
 			index++;
 		}