diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
index 27eb0b18..97c6ad66 100644
--- a/src/main/java/org/bukkit/command/PluginCommand.java
+++ b/src/main/java/org/bukkit/command/PluginCommand.java
@@ -27,6 +27,10 @@ public final class PluginCommand extends Command {
     public boolean execute(CommandSender sender, String commandLabel, String[] args) {
         boolean success = false;
 
+        if (!owningPlugin.isEnabled()) {
+            return false;
+        }
+
         try {
             success = executor.onCommand(sender, this, commandLabel, args);
         } catch (Throwable ex) {