diff --git a/modules/autoop.cpp b/modules/autoop.cpp
index 9d828b7e..784ce074 100644
--- a/modules/autoop.cpp
+++ b/modules/autoop.cpp
@@ -167,7 +167,10 @@ public:
 						PutIRC("MODE " + Channel.GetName() + " +o " + Nick.GetNick());
 					} else {
 						// then insert this nick into the queue, the timer does the rest
-						m_msQueue[Nick.GetNick().AsLower()] = "";
+						CString sNick = Nick.GetNick().AsLower();
+						if (m_msQueue.find(sNick) == m_msQueue.end()) {
+							m_msQueue[sNick] = "";
+						}
 					}
 
 					break;