diff --git a/src/main/java/emu/grasscutter/command/commands/ListCommand.java b/src/main/java/emu/grasscutter/command/commands/ListCommand.java
index 99abd7ac7..9ff8d2fe1 100644
--- a/src/main/java/emu/grasscutter/command/commands/ListCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/ListCommand.java
@@ -19,9 +19,20 @@ public final class ListCommand implements CommandHandler {
if (playersMap.size() != 0) {
StringBuilder playerSet = new StringBuilder();
- playersMap.values().forEach(player ->
- playerSet.append(player.getNickname()).append(", "));
-
+ playersMap.values().forEach(player -> {
+ playerSet.append(player.getNickname());
+
+ if (sender != null) {
+ playerSet.append(", ");
+ } else {
+ playerSet.append(", ");
+ }
+ });
+
String players = playerSet.toString();
CommandHandler.sendMessage(sender, players.substring(0, players.length() - 2));
}