diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
index d34140c3..ec66c28a 100644
--- a/src/main/java/org/bukkit/command/PluginCommand.java
+++ b/src/main/java/org/bukkit/command/PluginCommand.java
@@ -61,7 +61,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
      * @param executor New executor to run
      */
     public void setExecutor(CommandExecutor executor) {
-        this.executor = executor;
+        this.executor = executor == null ? owningPlugin : executor;
     }
 
     /**