diff --git a/lophine-server/src/main/java/org/leavesmc/leaves/command/bot/subcommands/RemoveCommand.java b/lophine-server/src/main/java/org/leavesmc/leaves/command/bot/subcommands/RemoveCommand.java
index efb31d3..2cf87b9 100644
--- a/lophine-server/src/main/java/org/leavesmc/leaves/command/bot/subcommands/RemoveCommand.java
+++ b/lophine-server/src/main/java/org/leavesmc/leaves/command/bot/subcommands/RemoveCommand.java
@@ -56,9 +56,7 @@ public class RemoveCommand extends BotSubcommand {
 
     private static boolean removeBot(@NotNull ServerBot bot, @Nullable CommandSender sender, boolean taskQueue) {
         if (taskQueue) {
-            bot.getBukkitEntity().taskScheduler.schedule((LivingEntity nmsEntity) -> {
-                removeBotOrigin(bot, sender);
-            }, null, 1L);
+            bot.getBukkitEntity().taskScheduler.schedule((LivingEntity nmsEntity) -> removeBotOrigin(bot, sender), null, 1L);
         } else {
             return removeBotOrigin(bot, sender);
         }
diff --git a/lophine-server/src/main/java/org/leavesmc/leaves/command/bot/subcommands/SaveCommand.java b/lophine-server/src/main/java/org/leavesmc/leaves/command/bot/subcommands/SaveCommand.java
index 75c1851..5feda17 100644
--- a/lophine-server/src/main/java/org/leavesmc/leaves/command/bot/subcommands/SaveCommand.java
+++ b/lophine-server/src/main/java/org/leavesmc/leaves/command/bot/subcommands/SaveCommand.java
@@ -21,6 +21,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import fun.bm.lophine.config.modules.function.FakeplayerConfig;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.world.entity.LivingEntity;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import org.leavesmc.leaves.bot.BotList;
@@ -55,8 +56,24 @@ public class SaveCommand extends BotSubcommand {
 
         @Override
         protected boolean execute(@NotNull CommandContext context) throws CommandSyntaxException {
-            ServerBot bot = context.getCustomArgument(BotArgument.class);
-            CommandSender sender = context.getSender();
+            save(context.getCustomArgument(BotArgument.class), context.getSender());
+            return true;
+        }
+
+        private boolean save(ServerBot bot, CommandSender sender) {
+            return save(bot, sender, true);
+        }
+
+        private boolean save(ServerBot bot, CommandSender sender, boolean taskQueue) {
+            if (taskQueue) {
+                bot.getBukkitEntity().taskScheduler.schedule((LivingEntity nmsEntity) -> saveOrigin(bot, sender), null, 1L);
+            } else {
+                saveOrigin(bot, sender);
+            }
+            return true;
+        }
+
+        private boolean saveOrigin(ServerBot bot, CommandSender sender) {
             BotList botList = BotList.INSTANCE;
 
             boolean success = botList.removeBot(bot, BotRemoveEvent.RemoveReason.COMMAND, sender, true);