diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index 291410da9..5111603eb 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -1561,15 +1561,6 @@ void CClient::ProcessServerInfo(int RawType, NETADDR *pFrom, const void *pData,
 #undef GET_INT
 }
 
-bool CClient::ShouldSendChatTimeoutCodeHeuristic()
-{
-	if(m_ServerSentCapabilities)
-	{
-		return false;
-	}
-	return str_find_nocase(m_CurrentServerInfo.m_aGameType, "ddracenet") || str_find_nocase(m_CurrentServerInfo.m_aGameType, "ddnet");
-}
-
 static CServerCapabilities GetServerCapabilities(int Version, int Flags)
 {
 	CServerCapabilities Result;
@@ -2156,7 +2147,7 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 
 					if(m_aReceivedSnapshots[Conn] > 50 && !m_aCodeRunAfterJoin[Conn])
 					{
-						if(m_ServerCapabilities.m_ChatTimeoutCode || ShouldSendChatTimeoutCodeHeuristic())
+						if(m_ServerCapabilities.m_ChatTimeoutCode)
 						{
 							CNetMsg_Cl_Say MsgP;
 							MsgP.m_Team = 0;
diff --git a/src/engine/client/client.h b/src/engine/client/client.h
index 2f79ca3d6..d327f7c5d 100644
--- a/src/engine/client/client.h
+++ b/src/engine/client/client.h
@@ -251,8 +251,6 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	bool m_ServerSentCapabilities;
 	CServerCapabilities m_ServerCapabilities;
 
-	bool ShouldSendChatTimeoutCodeHeuristic();
-
 	CServerInfo m_CurrentServerInfo;
 	int64_t m_CurrentServerInfoRequestTime; // >= 0 should request, == -1 got info