diff --git a/pkg/generators/natsnames.go b/pkg/generators/natsnames.go
index 7220c1f9c4..1a64d4423f 100644
--- a/pkg/generators/natsnames.go
+++ b/pkg/generators/natsnames.go
@@ -33,12 +33,9 @@ func GenerateConnectionName(service string, ntype NType) string {
 
 // firstNRunes returns the first n runes of a string
 func firstNRunes(s string, n int) string {
-	i := 0
-	for j := range s {
-		if i == n {
-			return s[:j]
-		}
-		i++
+	runes := []rune(s)
+	if n > len(runes) {
+		n = len(runes)
 	}
-	return s
+	return string(runes[:n])
 }