diff --git a/ucs/chatchannel.cpp b/ucs/chatchannel.cpp
index a8fa146eb..a8a7cc797 100644
--- a/ucs/chatchannel.cpp
+++ b/ucs/chatchannel.cpp
@@ -701,11 +701,11 @@ void ChatChannelList::Process() {
 			LogDebug("Empty temporary password protected channel [{}] being destroyed",
 				CurrentChannel->GetName().c_str());
 
-			RemoveChannel(CurrentChannel);
+			iterator.RemoveCurrent();
+		}
+		else {
+			iterator.Advance();
 		}
-
-		iterator.Advance();
-
 	}
 }