diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index 81d26526d..0b887b878 100644
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -99,6 +99,9 @@ local function session_close(session, reason)
 			end
 		end
 		session.sends2s("</stream:stream>");
+		if sesson.notopen or not session.conn.close() then
+			session.conn.close(true); -- Force FIXME: timer?
+		end
 		session.conn.close();
 		xmppserver.disconnect(session.conn, "stream error");
 	end