diff --git a/src/services/command/CommandService.java b/src/services/command/CommandService.java
index 689983b4..7e395b55 100644
--- a/src/services/command/CommandService.java
+++ b/src/services/command/CommandService.java
@@ -84,7 +84,7 @@ public class CommandService implements INetworkDispatch  {
 			return false;
 		}
 		
-		if (actor.hasCooldown(command.getCooldownGroup())) {
+		if (actor.hasCooldown(command.getCooldownGroup()) || actor.hasCooldown(command.getCommandName())) {
 			return false;
 		}