diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 6a94a5f3e..bb0c3987b 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -472,29 +472,33 @@ public class XmppConnection implements Runnable {
 				this.jingleListener.onJinglePacketReceived(account,(JinglePacket) packet);
 			}
 		} else {
+			OnIqPacketReceived callback = null;
 			synchronized (this.packetCallbacks) {
 				if (packetCallbacks.containsKey(packet.getId())) {
 					final Pair<IqPacket, OnIqPacketReceived> packetCallbackDuple = packetCallbacks.get(packet.getId());
 					// Packets to the server should have responses from the server
 					if (packetCallbackDuple.first.toServer(account)) {
 						if (packet.fromServer(account)) {
-							packetCallbackDuple.second.onIqPacketReceived(account, packet);
+							callback = packetCallbackDuple.second;
 							packetCallbacks.remove(packet.getId());
 						} else {
 							Log.e(Config.LOGTAG, account.getJid().toBareJid().toString() + ": ignoring spoofed iq packet");
 						}
 					} else {
 						if (packet.getFrom().equals(packetCallbackDuple.first.getTo())) {
-							packetCallbackDuple.second.onIqPacketReceived(account, packet);
+							callback = packetCallbackDuple.second;
 							packetCallbacks.remove(packet.getId());
 						} else {
 							Log.e(Config.LOGTAG, account.getJid().toBareJid().toString() + ": ignoring spoofed iq packet");
 						}
 					}
 				} else if (packet.getType() == IqPacket.TYPE.GET || packet.getType() == IqPacket.TYPE.SET) {
-					this.unregisteredIqListener.onIqPacketReceived(account, packet);
+					callback = this.unregisteredIqListener;
 				}
 			}
+			if (callback != null) {
+				callback.onIqPacketReceived(account,packet);
+			}
 		}
 	}