diff --git a/smack-integration-test/src/main/java/org/igniterealtime/smack/XmppConnectionStressTest.java b/smack-integration-test/src/main/java/org/igniterealtime/smack/XmppConnectionStressTest.java
index 5a6192fd9..adc0a5be9 100644
--- a/smack-integration-test/src/main/java/org/igniterealtime/smack/XmppConnectionStressTest.java
+++ b/smack-integration-test/src/main/java/org/igniterealtime/smack/XmppConnectionStressTest.java
@@ -134,6 +134,9 @@ public class XmppConnectionStressTest {
         Map<XMPPConnection, Map<EntityFullJid, boolean[]>> receiveMarkers = new ConcurrentHashMap<>(connections.size());
 
         for (XMPPConnection connection : connections) {
+            final Map<EntityFullJid, boolean[]> myReceiveMarkers = new HashMap<>(connections.size());
+            receiveMarkers.put(connection, myReceiveMarkers);
+
             connection.addSyncStanzaListener(new StanzaListener() {
                 @Override
                 public void processStanza(Stanza stanza) {
@@ -145,12 +148,6 @@ public class XmppConnectionStressTest {
 
                     Integer messageNumber = (Integer) extension.getProperty(MESSAGE_NUMBER_PROPERTY);
 
-                    Map<EntityFullJid, boolean[]> myReceiveMarkers = receiveMarkers.get(connection);
-                    if (myReceiveMarkers == null) {
-                        myReceiveMarkers = new HashMap<>(connections.size());
-                        receiveMarkers.put(connection, myReceiveMarkers);
-                    }
-
                     boolean[] fromMarkers = myReceiveMarkers.get(from);
                     if (fromMarkers == null) {
                         fromMarkers = new boolean[configuration.messagesPerConnection];