diff --git a/build.gradle.kts b/build.gradle.kts
index 844152f..580024f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -47,7 +47,7 @@ tasks {
     // 1.17           = Java 16
     // 1.18 - 1.20.4  = Java 17
     // 1-20.5+        = Java 21
-    val version = "1.20.6"
+    val version = "1.21"
     val javaVersion = JavaLanguageVersion.of(21)
 
     val jvmArgsExternal = listOf(
diff --git a/libs.versions.toml b/libs.versions.toml
index 9bd2680..c7a5141 100644
--- a/libs.versions.toml
+++ b/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 adventure = "4.16.0"
 packetevents = "2.3.1-SNAPSHOT"
-paper = "1.20.6-R0.1-SNAPSHOT"
+paper = "1.21-R0.1-SNAPSHOT"
 velocity = "3.3.0-SNAPSHOT"
 bungeecord = "1.20-R0.1-SNAPSHOT"
 snakeyaml = "2.2"
diff --git a/platforms/bukkit/src/main/java/com/deathmotion/antihealthindicator/BukkitAntiHealthIndicator.java b/platforms/bukkit/src/main/java/com/deathmotion/antihealthindicator/BukkitAntiHealthIndicator.java
index 744dc90..842ec49 100644
--- a/platforms/bukkit/src/main/java/com/deathmotion/antihealthindicator/BukkitAntiHealthIndicator.java
+++ b/platforms/bukkit/src/main/java/com/deathmotion/antihealthindicator/BukkitAntiHealthIndicator.java
@@ -80,6 +80,6 @@ protected void enableBStats() {
     }
 
     protected void registerCommands() {
-        this.plugin.getCommand("antihealthindicator").setExecutor(new BukkitAHICommand());
+        new BukkitAHICommand(this.plugin);
     }
 }
\ No newline at end of file
diff --git a/platforms/bukkit/src/main/java/com/deathmotion/antihealthindicator/commands/BukkitAHICommand.java b/platforms/bukkit/src/main/java/com/deathmotion/antihealthindicator/commands/BukkitAHICommand.java
index bf3757c..943f8d0 100644
--- a/platforms/bukkit/src/main/java/com/deathmotion/antihealthindicator/commands/BukkitAHICommand.java
+++ b/platforms/bukkit/src/main/java/com/deathmotion/antihealthindicator/commands/BukkitAHICommand.java
@@ -29,6 +29,7 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -39,6 +40,10 @@
 
 public class BukkitAHICommand implements CommandExecutor, TabExecutor {
 
+    public BukkitAHICommand(JavaPlugin plugin) {
+        plugin.getCommand("antihealthindicator").setExecutor(this);
+    }
+
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
         if (args.length == 0) {