diff --git a/src/net/common/ircthread.cpp b/src/net/common/ircthread.cpp
index 6f8b5fef..1e2581ed 100644
--- a/src/net/common/ircthread.cpp
+++ b/src/net/common/ircthread.cpp
@@ -216,7 +216,10 @@ IrcThread::Main()
 	if (s)
 	{
 		if (irc_connect(s, context.serverAddress.c_str(), context.serverPort, 0, context.nick.c_str(), 0, 0) == 0)
-			irc_run(s);
+		{
+			if (!ShouldTerminate())
+				irc_run(s);
+		}
 	}
 }