diff --git a/modules/partyline.cpp b/modules/partyline.cpp
index adb7d18d..2b20149c 100644
--- a/modules/partyline.cpp
+++ b/modules/partyline.cpp
@@ -361,7 +361,7 @@ public:
 					+ sCmd + pChannel->GetName() + sMsg, false, true, pUser);
 		}
 
-		if (m_ssDefaultChans.find(pChannel->GetName()) != m_ssDefaultChans.end()) {
+		if (!pUser->IsBeingDeleted() && m_ssDefaultChans.find(pChannel->GetName()) != m_ssDefaultChans.end()) {
 			JoinUser(pUser, pChannel);
 		}