diff --git a/build.gradle.kts b/build.gradle.kts
index 2dc59f90..17878af3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 val githubRepo = "jakobkmar/KSpigot"
 
 group = "net.axay"
-version = "1.17.3"
+version = "1.17.4"
 
 description = "A Kotlin API for the Minecraft Server Software \"Spigot\"."
 
diff --git a/src/main/kotlin/net/axay/kspigot/main/KSpigot.kt b/src/main/kotlin/net/axay/kspigot/main/KSpigot.kt
index fa370f8c..17a6bc97 100644
--- a/src/main/kotlin/net/axay/kspigot/main/KSpigot.kt
+++ b/src/main/kotlin/net/axay/kspigot/main/KSpigot.kt
@@ -66,7 +66,10 @@ abstract class KSpigot : JavaPlugin() {
     final override fun onEnable() {
         startup()
 
-        BrigardierSupport.registerAll()
+        // Only register the listeners, when the plugin is still enabled and didn't get disabled in the shutdown method
+        if (this.isEnabled) {
+            BrigardierSupport.registerAll()
+        }
     }
 
     final override fun onDisable() {