diff --git a/src/messaging/imap/IMAPConnection.cpp b/src/messaging/imap/IMAPConnection.cpp
index 586a1716..5b82c113 100644
--- a/src/messaging/imap/IMAPConnection.cpp
+++ b/src/messaging/imap/IMAPConnection.cpp
@@ -155,10 +155,13 @@ void IMAPConnection::disconnect()
 
 void IMAPConnection::internalDisconnect()
 {
-	send(true, "LOGOUT", true);
+	if (isConnected())
+	{
+		send(true, "LOGOUT", true);
 
-	m_socket->disconnect();
-	m_socket = NULL;
+		m_socket->disconnect();
+		m_socket = NULL;
+	}
 
 	m_timeoutHandler = NULL;