diff --git a/src/main/java/emu/grasscutter/command/commands/GodModeCommand.java b/src/main/java/emu/grasscutter/command/commands/GodModeCommand.java
index e5635dc9f..0b4139ac1 100644
--- a/src/main/java/emu/grasscutter/command/commands/GodModeCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/GodModeCommand.java
@@ -1,5 +1,6 @@
 package emu.grasscutter.command.commands;
 
+import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.GenshinPlayer;
@@ -16,7 +17,29 @@ public final class GodModeCommand implements CommandHandler {
             CommandHandler.sendMessage(null, "Run this command in-game.");
             return; // TODO: toggle player's godmode statue from console or other players
         }
-        sender.setGodmode(!sender.inGodmode());
-        sender.dropMessage("Godmode is now " + (sender.inGodmode() ? "enabled" : "disabled") + ".");
+
+        int target;
+        if (args.size() == 1) {
+            try {
+                target = Integer.parseInt(args.get(0));
+                if (Grasscutter.getGameServer().getPlayerByUid(target) == null) {
+                    target = sender.getUid();
+                }
+            } catch (NumberFormatException e) {
+                CommandHandler.sendMessage(sender, "Invalid player id.");
+                return;
+            }
+        } else {
+            target = sender.getUid();
+        }
+        GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
+        if (targetPlayer == null) {
+            CommandHandler.sendMessage(sender, "Player not found.");
+            return;
+        }
+
+        targetPlayer.setGodmode(!targetPlayer.inGodmode());
+        sender.dropMessage("Godmode is now " + (targetPlayer.inGodmode() ? "enabled" : "disabled") +
+                "for " + targetPlayer.getNickname() + " .");
     }
 }