diff --git a/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp b/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp
index a51d79f13f..d1200966c1 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp
@@ -55,7 +55,7 @@ POP3Protocol::POP3Protocol(BMessage *settings, BMailChainRunner *status)
 POP3Protocol::~POP3Protocol()
 {
 #ifdef USESSL
-	if(use_ssl && ssl)
+	if( (use_ssl && ssl) || !use_ssl)
 		SendCommand("QUIT" CRLF);
 #else
 	SendCommand("QUIT" CRLF);