diff --git a/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java b/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java
index 0d9b8fcd0..836835828 100644
--- a/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java
@@ -55,11 +55,10 @@ public abstract class ChatCommand implements TabExecutor {
                 return true;
 
             case 1:
-                if (!CommandUtils.hasPlayerDataKey(sender)) {
-                    return true;
-                }
-
                 if (CommandUtils.shouldEnableToggle(args[0])) {
+                    if (!CommandUtils.hasPlayerDataKey(sender)) {
+                        return true;
+                    }
                     if (CommandUtils.noConsoleUsage(sender)) {
                         return true;
                     }
@@ -69,6 +68,9 @@ public abstract class ChatCommand implements TabExecutor {
                 }
 
                 if (CommandUtils.shouldDisableToggle(args[0])) {
+                    if (!CommandUtils.hasPlayerDataKey(sender)) {
+                        return true;
+                    }
                     if (CommandUtils.noConsoleUsage(sender)) {
                         return true;
                     }