diff --git a/src/main/java/net/md_5/bungee/command/CommandList.java b/src/main/java/net/md_5/bungee/command/CommandList.java
index dc26dd281..c570357ae 100644
--- a/src/main/java/net/md_5/bungee/command/CommandList.java
+++ b/src/main/java/net/md_5/bungee/command/CommandList.java
@@ -17,6 +17,11 @@ public class CommandList extends Command
         StringBuilder users = new StringBuilder();
         Collection<UserConnection> connections = BungeeCord.instance.connections.values();
 
+        if (connections.size() == 0) {
+            sender.sendMessage(ChatColor.BLUE + "Currently no players online.");
+            return;
+        }
+
         for (UserConnection con : connections)
         {
             switch (getPermission(con))