diff --git a/src/component/command.cpp b/src/component/command.cpp
index d55ed16..428b7f8 100644
--- a/src/component/command.cpp
+++ b/src/component/command.cpp
@@ -11,6 +11,7 @@
 #include <utils/string.hpp>
 #include <utils/memory.hpp>
 #include <utils/hook.hpp>
+#include <utils/flags.hpp>
 
 namespace command
 {
@@ -270,7 +271,11 @@ namespace command
 		void on_startup([[maybe_unused]] plugin::plugin* plugin) override
 		{
 			scripting::on_shutdown(clear);
-			client_command_hook.create(SELECT_VALUE(0x4AF770, 0x63DB70), client_command_stub);
+
+			if (!utils::flags::has_flag("disable-client-command"))
+			{
+				client_command_hook.create(SELECT_VALUE(0x4AF770, 0x63DB70), client_command_stub);
+			}
 
 			gsc::function::add_multiple([](const std::string& command)
 			{