diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/DeliveryAgent.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/DeliveryAgent.java
index d9b6fb8d02..eb789aa376 100644
--- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/DeliveryAgent.java
+++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/DeliveryAgent.java
@@ -259,9 +259,6 @@ public void connected(HttpRoute route, NHttpClientConnection conn) {
                 MessageContext messageContext = queue.poll();
 
                 if (messageContext != null) {
-                    messageContext.setProperty(PassThroughConstants.PASS_THROUGH_TARGET_CONNECTION, conn);
-                    messageContext.setProperty(PassThroughConstants.PASS_THROUGH_TARGET_CONFIGURATION,
-                            targetConfiguration);
                     tryNextMessage(messageContext, route, conn);
                     conn = null;
                 }
@@ -279,6 +276,8 @@ public void connected(HttpRoute route, NHttpClientConnection conn) {
     private void tryNextMessage(MessageContext messageContext, HttpRoute route, NHttpClientConnection conn) {
         if (conn != null) {
             try {
+                messageContext.setProperty(PassThroughConstants.PASS_THROUGH_TARGET_CONNECTION, conn);
+                messageContext.setProperty(PassThroughConstants.PASS_THROUGH_TARGET_CONFIGURATION, targetConfiguration);
                 HttpContext ctx = conn.getContext();
                 /*
                 * If the flow is SSE we need to set references to target connection and targetConnections