diff --git a/source/cClientHandle.cpp b/source/cClientHandle.cpp
index 0eb621920..bd02e31c3 100644
--- a/source/cClientHandle.cpp
+++ b/source/cClientHandle.cpp
@@ -203,9 +203,12 @@ cClientHandle::~cClientHandle()
 
 	if (m_Socket.IsValid())
 	{
-		cPacket_Disconnect Disconnect;
-		Disconnect.m_Reason = "Server shut down? Kthnxbai";
-		m_Socket.Send(&Disconnect);
+		if(!m_bKicking)
+		{
+			cPacket_Disconnect Disconnect;
+			Disconnect.m_Reason = "Server shut down? Kthnxbai";
+			m_Socket.Send(&Disconnect);
+		}
 	}
 	
 	if (m_Player != NULL)