diff --git a/src/ConnectConnection.cpp b/src/ConnectConnection.cpp
index 086cf2b..d783772 100644
--- a/src/ConnectConnection.cpp
+++ b/src/ConnectConnection.cpp
@@ -189,6 +189,10 @@ void ConnectConnection::handleResponse(Handler* h)
                     res->set(mParser);
                     req->setResponse(res);
                     mAcceptConnection->append(req);
+                    if (mAcceptConnection->inPendSub()) {
+                        mParser.reset();
+                        return;
+                    }
                     mSentRequests.push_front(req);
                 }
                 break;
diff --git a/test/pubsub_subscription_order.py b/test/pubsub_subscription_order.py
new file mode 100644
index 0000000..8b920a7
--- /dev/null
+++ b/test/pubsub_subscription_order.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+#
+# Verify subscription confirmations arrive before messages
+#
+
+import argparse
+import sys
+import redis
+import time
+
+
+def run_test(host, port):
+    c1 = redis.StrictRedis(host=host, port=port)
+    c2 = redis.StrictRedis(host=host, port=port)
+
+    ps = c1.pubsub()
+    ps.subscribe("ch_order")
+
+    # Publish quickly after subscribe to stress ordering.
+    c2.publish("ch_order", "order_msg")
+
+    msgs = []
+    for _ in range(5):
+        msg = ps.get_message(timeout=0.5)
+        if msg:
+            msgs.append(msg)
+        if len(msgs) >= 2:
+            break
+
+    if not msgs:
+        print("FAIL: missing subscribe confirmation")
+        return False
+
+    if msgs[0].get("type") != "subscribe":
+        print("FAIL: first message is not subscribe:", msgs[0])
+        return False
+
+    if len(msgs) > 1 and msgs[1].get("type") != "message":
+        print("FAIL: second message is not data message:", msgs[1])
+        return False
+
+    return True
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(conflict_handler='resolve', description="Pubsub subscription order test")
+    parser.add_argument("-h", "--host", default="127.0.0.1")
+    parser.add_argument("-p", "--port", type=int, default=7617)
+    args = parser.parse_args()
+
+    if run_test(args.host, args.port):
+        print("PASS: pubsub subscription order")
+        sys.exit(0)
+    print("FAIL: pubsub subscription order")
+    sys.exit(1)
diff --git a/test/run.sh b/test/run.sh
index 216b171..8094d32 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -60,12 +60,14 @@ PUBSUB_REDIS_EXIT=0
 PUBSUB_MINIMAL_EXIT=0
 PUBSUB_EXIT=0
 PUBSUB_MESSAGE_EXIT=0
+PUBSUB_ORDER_EXIT=0
 
 uv run python3 test/basic.py || BASIC_EXIT=$?
 uv run python3 test/pubsub_minimal.py -p 7617 || PUBSUB_REDIS_EXIT=$?
 uv run python3 test/pubsub_minimal.py -p 6379 || PUBSUB_MINIMAL_EXIT=$?
 uv run python3 test/pubsub.py || PUBSUB_EXIT=$?
+uv run python3 test/pubsub_subscription_order.py -p 7617 || PUBSUB_ORDER_EXIT=$?
 uv run python3 test/pubsub_message_response.py -p 7617 || PUBSUB_MESSAGE_EXIT=$?
 
-TEST_EXIT=$((BASIC_EXIT + PUBSUB_REDIS_EXIT + PUBSUB_MINIMAL_EXIT + PUBSUB_EXIT + PUBSUB_MESSAGE_EXIT))
+TEST_EXIT=$((BASIC_EXIT + PUBSUB_REDIS_EXIT + PUBSUB_MINIMAL_EXIT + PUBSUB_EXIT + PUBSUB_MESSAGE_EXIT + PUBSUB_ORDER_EXIT))
 exit $TEST_EXIT