diff --git a/src/main/java/land/chipmunk/chipmunkmod/command/CommandManager.java b/src/main/java/land/chipmunk/chipmunkmod/command/CommandManager.java
index 064742c..375f913 100644
--- a/src/main/java/land/chipmunk/chipmunkmod/command/CommandManager.java
+++ b/src/main/java/land/chipmunk/chipmunkmod/command/CommandManager.java
@@ -8,6 +8,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import land.chipmunk.chipmunkmod.commands.*;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.command.CommandRegistryAccess;
 import net.minecraft.text.ClickEvent;
 import net.minecraft.text.MutableText;
@@ -37,6 +38,7 @@ public class CommandManager {
         AutoSkinCommand.register(this.dispatcher);
         ReloadConfigCommand.register(this.dispatcher);
         SelfCareCommand.register(this.dispatcher);
+        PrefixCommand.register(this.dispatcher);
     }
 
     public static LiteralArgumentBuilder<FabricClientCommandSource> literal (final String name) {
@@ -49,8 +51,11 @@ public class CommandManager {
 
     public void executeCommand (final String command) {
         final MinecraftClient client = MinecraftClient.getInstance();
+        final ClientPlayNetworkHandler networkHandler = client.getNetworkHandler();
 
-        final FabricClientCommandSource commandSource = (FabricClientCommandSource) client.getNetworkHandler().getCommandSource();
+        if (networkHandler == null) return;
+
+        final FabricClientCommandSource commandSource = (FabricClientCommandSource) networkHandler.getCommandSource();
 
         try {
             dispatcher.execute(command, commandSource);
diff --git a/src/main/java/land/chipmunk/chipmunkmod/commands/PrefixCommand.java b/src/main/java/land/chipmunk/chipmunkmod/commands/PrefixCommand.java
new file mode 100644
index 0000000..ca067aa
--- /dev/null
+++ b/src/main/java/land/chipmunk/chipmunkmod/commands/PrefixCommand.java
@@ -0,0 +1,38 @@
+package land.chipmunk.chipmunkmod.commands;
+
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.context.CommandContext;
+import land.chipmunk.chipmunkmod.ChipmunkMod;
+import land.chipmunk.chipmunkmod.command.CommandManager;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import net.minecraft.text.Text;
+
+import static com.mojang.brigadier.arguments.StringArgumentType.*;
+import static land.chipmunk.chipmunkmod.command.CommandManager.argument;
+import static land.chipmunk.chipmunkmod.command.CommandManager.literal;
+
+public class PrefixCommand {
+    public static void register (final CommandDispatcher<FabricClientCommandSource> dispatcher) {
+        dispatcher.register(
+                literal("prefix")
+                        .then(
+                                argument("newPrefix", greedyString())
+                                        .executes(PrefixCommand::execute)
+                        )
+        );
+    }
+
+    public static int execute (final CommandContext<FabricClientCommandSource> context) {
+        final FabricClientCommandSource source = context.getSource();
+
+        final String prefix = getString(context, "newPrefix");
+
+        ChipmunkMod.CONFIG.commands.prefix = prefix;
+        CommandManager.INSTANCE.prefix = prefix;
+
+        source.sendFeedback(Text.literal("Set the command prefix to: " + prefix));
+
+        return Command.SINGLE_SUCCESS;
+    }
+}