diff --git a/core/services/gateway/connectionmanager.go b/core/services/gateway/connectionmanager.go
index f06e7a0b193..d9ba7e2c437 100644
--- a/core/services/gateway/connectionmanager.go
+++ b/core/services/gateway/connectionmanager.go
@@ -305,9 +305,9 @@ func (m *donConnectionManager) getHandler(method string) (handlers.Handler, erro
 			return h, nil // supports legacy single-handler case
 		}
 	}
-	serviceName := strings.Split(method, ".")[0]
+	serviceName, _, hasDot := strings.Cut(method, ".")
 	// Special case for legacy methods - default to "workflows" service.
-	if !strings.Contains(method, ".") {
+	if !hasDot {
 		serviceName = "workflows"
 	}
 	handler, ok := m.handlers[serviceName]