diff --git a/components/carbon-transports/websocket/org.wso2.carbon.websocket.transport/src/main/java/org/wso2/carbon/websocket/transport/WebsocketConnectionFactory.java b/components/carbon-transports/websocket/org.wso2.carbon.websocket.transport/src/main/java/org/wso2/carbon/websocket/transport/WebsocketConnectionFactory.java
index 8e3767c79e..360cb15fed 100644
--- a/components/carbon-transports/websocket/org.wso2.carbon.websocket.transport/src/main/java/org/wso2/carbon/websocket/transport/WebsocketConnectionFactory.java
+++ b/components/carbon-transports/websocket/org.wso2.carbon.websocket.transport/src/main/java/org/wso2/carbon/websocket/transport/WebsocketConnectionFactory.java
@@ -235,12 +235,12 @@ public WebSocketClientHandler cacheNewConnection(final String tenantDomain,
                 handler = new WebSocketClientHandler(WebSocketClientHandshakerFactory.newHandshaker(uri,
                         WebSocketVersion.V13,
                         deriveSubprotocol(wsSubprotocol, contentType),
-                        false, defaultHttpHeaders, maxLength));
+                        false, defaultHttpHeaders, maxLength, true, false, -1L, false, false));
             } else {
                 handler = new WebSocketClientHandler(WebSocketClientHandshakerFactory.newHandshaker(uri,
                         WebSocketVersion.V13,
                         deriveSubprotocol(wsSubprotocol, contentType),
-                        false, defaultHttpHeaders));
+                        false, defaultHttpHeaders, 65536, true, false, -1L, false, false));
             }
             handler.setCorrelationId(correlationId);
             handler.setApiProperties(apiProperties);
diff --git a/components/carbon-transports/websocket/org.wso2.carbon.websocket.transport/src/main/java/org/wso2/carbon/websocket/transport/WebsocketTransportSender.java b/components/carbon-transports/websocket/org.wso2.carbon.websocket.transport/src/main/java/org/wso2/carbon/websocket/transport/WebsocketTransportSender.java
index 9f23349f4e..1593569140 100644
--- a/components/carbon-transports/websocket/org.wso2.carbon.websocket.transport/src/main/java/org/wso2/carbon/websocket/transport/WebsocketTransportSender.java
+++ b/components/carbon-transports/websocket/org.wso2.carbon.websocket.transport/src/main/java/org/wso2/carbon/websocket/transport/WebsocketTransportSender.java
@@ -165,6 +165,13 @@ public void sendMessage(MessageContext msgCtx, String targetEPR, OutTransportInf
             String preservableHeaders = preserveWebSocketHeadersParameter.getValue().toString();
             for (String header : preservableHeaders.split(",")) {
                 Object headerValue = msgCtx.getProperty(header);
+                Iterator<String> headerNames = msgCtx.getPropertyNames();
+                while (headerValue == null && headerNames.hasNext()) {
+                    String headerName = headerNames.next();
+                    if (headerName.equalsIgnoreCase(header)) {
+                        headerValue = msgCtx.getProperty(headerName);
+                    }
+                }
                 if (headerValue != null) {
                     customHeaders.put(header, headerValue);
                 }