diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/DelegatedBukkitCommand.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/DelegatedBukkitCommand.kt
index 8a2ca25d..ee4bc70b 100644
--- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/DelegatedBukkitCommand.kt
+++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/DelegatedBukkitCommand.kt
@@ -1,5 +1,6 @@
 package com.willfp.eco.internal.command
 
+import org.bukkit.Location
 import org.bukkit.command.Command
 import org.bukkit.command.CommandSender
 import org.bukkit.command.PluginIdentifiableCommand
@@ -21,7 +22,16 @@ class DelegatedBukkitCommand(
         label: String,
         args: Array<out String>?
     ): List<String> {
-        return delegate.onTabComplete(sender, this, label, args) ?: emptyList()
+        return delegate.onTabComplete(sender, this, label, args)
+    }
+
+    override fun tabComplete(
+        sender: CommandSender,
+        alias: String,
+        args: Array<out String>?,
+        location: Location?
+    ): List<String> {
+        return delegate.onTabComplete(sender, this, alias, args)
     }
 
     override fun getPlugin() = delegate.plugin
diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/HandledCommand.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/HandledCommand.kt
index 0136c77b..3ead12e1 100644
--- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/HandledCommand.kt
+++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/HandledCommand.kt
@@ -50,7 +50,7 @@ abstract class HandledCommand(
         command: Command,
         label: String,
         args: Array<out String>?
-    ): List<String>? {
+    ): List<String> {
         return handleTabComplete(sender, args?.toList() ?: listOf())
     }