diff --git a/Chan.cpp b/Chan.cpp
index a87fefca..164c8065 100644
--- a/Chan.cpp
+++ b/Chan.cpp
@@ -207,7 +207,6 @@ CString CChan::GetModeForNames() const {
 void CChan::SetModes(const CString& sModes) {
 	m_musModes.clear();
 	m_uLimit = 0;
-	m_sCurKey = "";
 	ModeChange(sModes);
 }
 
@@ -331,10 +330,6 @@ void CChan::ModeChange(const CString& sModes, const CString& sOpNick) {
 					break;
 			}
 
-			if (uMode == M_Key) {
-				m_sCurKey = (bAdd) ? sArg : "";
-			}
-
 			if (!bList) {
 				(bAdd) ? AddMode(uMode, sArg) : RemMode(uMode, sArg);
 			}
diff --git a/Chan.h b/Chan.h
index 693afca2..8e6eaf24 100644
--- a/Chan.h
+++ b/Chan.h
@@ -131,7 +131,7 @@ public:
 	bool IsOn() const { return m_bIsOn; }
 	const CString& GetName() const { return m_sName; }
 	const map<unsigned char, CString>& GetModes() const { return m_musModes; }
-	const CString& GetKey() const { return (!m_sCurKey.empty()) ? m_sCurKey : m_sKey; }
+	const CString& GetKey() const { return m_sKey; }
 	unsigned int GetLimit() const { return m_uLimit; }
 	const CString& GetTopic() const { return m_sTopic; }
 	const CString& GetTopicOwner() const { return m_sTopicOwner; }
@@ -161,7 +161,6 @@ protected:
 	bool				m_bDisabled;
 	CString				m_sName;
 	CString				m_sKey;
-	CString				m_sCurKey;
 	CString				m_sTopic;
 	CString				m_sTopicOwner;
 	unsigned long		m_ulTopicDate;