diff --git a/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java b/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
index 5c5cd1b..76e600b 100644
--- a/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
+++ b/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
@@ -79,7 +79,7 @@ public class PlaceholderAPIPlugin extends JavaPlugin {
 	public void onEnable() {
 		config.loadDefConfig();
 		setupOptions();
-		setupCommands();
+		getCommand("placeholderapi").setExecutor(new PlaceholderAPICommands(this));
 		new PlaceholderListener(this);
 		getLogger().info("Placeholder expansion registration initializing...");
 		expansionManager.registerAllExpansions();
@@ -118,10 +118,6 @@ public class PlaceholderAPIPlugin extends JavaPlugin {
 		s.sendMessage(ChatColor.translateAlternateColorCodes('&', PlaceholderAPI.getRegisteredIdentifiers().size() + " &aplaceholder hooks successfully registered!"));
 	}
 
-	private void setupCommands() {
-		getCommand("placeholderapi").setExecutor(new PlaceholderAPICommands(this, (serverVersion != null && serverVersion.isSpigot())));
-	}
-
 	private void setupOptions() {
 		booleanTrue = config.booleanTrue();
 		if (booleanTrue == null) {