diff --git a/src/main/kotlin/net/axay/kspigot/commands/BrigardierSupport.kt b/src/main/kotlin/net/axay/kspigot/commands/BrigardierSupport.kt
index 337d7649..7426944e 100644
--- a/src/main/kotlin/net/axay/kspigot/commands/BrigardierSupport.kt
+++ b/src/main/kotlin/net/axay/kspigot/commands/BrigardierSupport.kt
@@ -46,8 +46,9 @@ object BrigardierSupport {
     @NMS_General
     internal fun registerAll() {
         commands.forEach { commandDispatcher.register(it) }
-        updateCommandTree()
         executedDefaultRegistration = true
+        if (onlinePlayers.isNotEmpty())
+            updateCommandTree()
     }
 
     @NMS_1_17
diff --git a/src/main/kotlin/net/axay/kspigot/main/KSpigot.kt b/src/main/kotlin/net/axay/kspigot/main/KSpigot.kt
index b93e0707..b4660f95 100644
--- a/src/main/kotlin/net/axay/kspigot/main/KSpigot.kt
+++ b/src/main/kotlin/net/axay/kspigot/main/KSpigot.kt
@@ -1,5 +1,6 @@
 package net.axay.kspigot.main
 
+import net.axay.kspigot.commands.BrigardierSupport
 import net.axay.kspigot.extensions.bukkit.warn
 import net.axay.kspigot.extensions.console
 import net.axay.kspigot.gui.GUIHolder
@@ -58,6 +59,7 @@ abstract class KSpigot : JavaPlugin() {
 
     final override fun onEnable() {
         startup()
+        BrigardierSupport.registerAll()
     }
 
     final override fun onDisable() {