diff --git a/src/Components/Loader.cpp b/src/Components/Loader.cpp
index 162037d7..4911ed34 100644
--- a/src/Components/Loader.cpp
+++ b/src/Components/Loader.cpp
@@ -70,7 +70,7 @@ namespace Components
 		Loader::Register(new Monitor());
 		Loader::Register(new Network());
 		Loader::Register(new Theatre());
-		Loader::Register(new Clantags());
+		//Loader::Register(new Clantags());
 		Loader::Register(new Download());
 		Loader::Register(new Playlist());
 		Loader::Register(new RawFiles());
diff --git a/src/Components/Modules/Clantags.cpp b/src/Components/Modules/Clantags.cpp
index 86dfa310..01b61b1d 100644
--- a/src/Components/Modules/Clantags.cpp
+++ b/src/Components/Modules/Clantags.cpp
@@ -35,10 +35,15 @@ namespace Components
 		Game::SV_GameSendServerCommand(-1, 0, command.data());
 	}
 
-	const char* Clantags::GetUserClantag(std::uint32_t clientnum, const char* playername)
+	const char* Clantags::GetUserClantag(std::uint32_t /*clientnum*/, const char* playername)
 	{
+#if 0
 		if (Clantags::Tags[clientnum].empty()) return playername;
 		return Utils::String::VA("[%s] %s", Clantags::Tags[clientnum].data(), playername);
+#else
+		return playername;
+#endif
+
 	}
 
 	__declspec(naked) void Clantags::DrawPlayerNameOnScoreboard()
diff --git a/src/Components/Modules/Dedicated.cpp b/src/Components/Modules/Dedicated.cpp
index 3093136b..25232a46 100644
--- a/src/Components/Modules/Dedicated.cpp
+++ b/src/Components/Modules/Dedicated.cpp
@@ -393,7 +393,7 @@ namespace Components
 						interval.update();
 
 						CardTitles::SendCustomTitlesToClients();
-						Clantags::SendClantagsToClients();
+						//Clantags::SendClantagsToClients();
 					}
 				});