diff --git a/modules/chansaver.cpp b/modules/chansaver.cpp
index 1da4b7f4..7ddd748f 100644
--- a/modules/chansaver.cpp
+++ b/modules/chansaver.cpp
@@ -59,14 +59,14 @@ public:
 	}
 
 	virtual void OnJoin(const CNick& Nick, CChan& Channel) {
-		if (Nick.GetNick() == m_pNetwork->GetIRCNick().GetNick()) {
+		if (Nick.GetNick() == m_pNetwork->GetIRCNick().GetNick() && !Channel.InConfig()) {
 			Channel.SetInConfig(true);
 			CZNC::Get().WriteConfig();
 		}
 	}
 
 	virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) {
-		if (Nick.GetNick() == m_pNetwork->GetIRCNick().GetNick()) {
+		if (Nick.GetNick() == m_pNetwork->GetIRCNick().GetNick() && Channel.InConfig()) {
 			Channel.SetInConfig(false);
 			CZNC::Get().WriteConfig();
 		}