diff --git a/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/CommandWhitelistBukkit.java b/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/CommandWhitelistBukkit.java
index d7f958d..c93893a 100644
--- a/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/CommandWhitelistBukkit.java
+++ b/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/CommandWhitelistBukkit.java
@@ -130,15 +130,16 @@ public class CommandWhitelistBukkit extends JavaPlugin {
     }
 
     /**
-     * @param command command
-     * @return custom command denied message
+     * @return Command denied message. Will use custom if command exists in any group.
      */
     public static String getCommandDeniedMessage(String command) {
-        String commandDeniedMessage = "";
+        String commandDeniedMessage = configCache.command_denied;
         HashMap<String, CWGroup> groups = configCache.getGroupList();
-        for (Map.Entry<String, CWGroup> s : groups.entrySet()) {
-            if (s.getValue().getCommands().contains(command)) {
-                commandDeniedMessage = s.getValue().getCustomCommandDeniedMessage();
+        for (CWGroup group : groups.values()) {
+            if (group.getCommands().contains(command)) {
+                if (group.getCommandDeniedMessage() == null) continue;
+                commandDeniedMessage = group.getCommandDeniedMessage();
+                break; // get first message we find
             }
         }
         return commandDeniedMessage;
diff --git a/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/PlayerCommandPreProcessListener.java b/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/PlayerCommandPreProcessListener.java
index eed5454..cae568f 100644
--- a/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/PlayerCommandPreProcessListener.java
+++ b/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/PlayerCommandPreProcessListener.java
@@ -24,12 +24,7 @@ public class PlayerCommandPreProcessListener implements Listener {
         HashSet<String> commands = CommandWhitelistBukkit.getCommands(player);
         if (!commands.contains(label)) {
             event.setCancelled(true);
-            String customCommandDeniedMessage = CommandWhitelistBukkit.getCommandDeniedMessage(label);
-            if (!customCommandDeniedMessage.equals("")) {
-                audiences.player(player).sendMessage(CWCommand.miniMessage.parse(config.prefix + customCommandDeniedMessage));
-            } else {
-                audiences.player(player).sendMessage(CWCommand.miniMessage.parse(config.prefix + config.command_denied));
-            }
+            audiences.player(player).sendMessage(CWCommand.miniMessage.parse(config.prefix + CommandWhitelistBukkit.getCommandDeniedMessage(label)));
             return;
         }
 
diff --git a/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/protocollib/PacketCommandPreProcessListener.java b/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/protocollib/PacketCommandPreProcessListener.java
index 28e5c77..629fbec 100644
--- a/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/protocollib/PacketCommandPreProcessListener.java
+++ b/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/protocollib/PacketCommandPreProcessListener.java
@@ -41,15 +41,9 @@ public class PacketCommandPreProcessListener {
                 BukkitAudiences audiences = CommandWhitelistBukkit.getAudiences();
                 if (!commands.contains(label)) {
                     event.setCancelled(true);
-                    String customCommandDeniedMessage = CommandWhitelistBukkit.getCommandDeniedMessage(label);
-                    if (!customCommandDeniedMessage.equals("")) {
-                        audiences.player(player).sendMessage(CWCommand.miniMessage.parse(config.prefix + customCommandDeniedMessage));
-                    } else {
-                        audiences.player(player).sendMessage(CWCommand.miniMessage.parse(config.prefix + config.command_denied));
-                    }
+                    audiences.player(player).sendMessage(CWCommand.miniMessage.parse(config.prefix + CommandWhitelistBukkit.getCommandDeniedMessage(label)));
                     return;
                 }
-
                 HashSet<String> bannedSubCommands = CommandWhitelistBukkit.getSuggestions(player);
                 for (String bannedSubCommand : bannedSubCommands) {
                     if (string.toLowerCase().substring(1).startsWith(bannedSubCommand)) {