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 7ad21e7f63..25a391d6ed 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp
@@ -112,6 +112,9 @@ POP3Protocol::Connect()
 status_t
 POP3Protocol::Disconnect()
 {
+	if (fServerConnection == NULL)
+		return B_OK;
+
 	SendCommand("QUIT" CRLF);
 
 	fServerConnection->Disconnect();