diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java
index f8ebc5986d..d792d56d9b 100644
--- a/core/src/io/anuke/mindustry/core/NetServer.java
+++ b/core/src/io/anuke/mindustry/core/NetServer.java
@@ -507,7 +507,12 @@ public class NetServer extends Module{
             }
         }
 
-        return name.substring(0, Math.min(name.length(), maxNameLength));
+        StringBuilder result = new StringBuilder();
+        int curChar = 0;
+        while(curChar < name.length() && result.toString().getBytes().length < maxNameLength){
+            result.append(name.charAt(curChar++));
+        }
+        return result.toString();
     }
 
     String checkColor(String str){