diff --git a/src/common/xmpp/dispatcher_nb.py b/src/common/xmpp/dispatcher_nb.py
index 73b8c2e3e..f5335d0e5 100644
--- a/src/common/xmpp/dispatcher_nb.py
+++ b/src/common/xmpp/dispatcher_nb.py
@@ -469,9 +469,10 @@ class XMPPDispatcher(PlugIn):
 				# would have placed the reply stanza in there
 				continue
 			if _id in self.on_responses:
-				self._owner.onreceive(None)
+				if len(self._expected) == 1:
+					self._owner.onreceive(None)
 				resp, args = self.on_responses[_id]
-				del(self.on_responses[_id])
+				del self.on_responses[_id]
 				if args is None:
 					resp(_iq)
 				else: