diff --git a/src/user.cpp b/src/user.cpp
index ac37f799f40416101c2ca3c28268504d12283930..f791b992d69704d6fa5ec761aae3705b5aae1c5a 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -263,6 +263,10 @@ void User::handlePresence(Swift::Presence::ref presence) {
 		}
 		return;
 	}
+	
+	if (presence->getType() == Swift::Presence::Unavailable) {
+		m_conversationManager->removeJID(presence->getFrom());
+	}
 
 
 	// User wants to disconnect this resource