diff --git a/secure_tunneling/source/SecureTunnel.cpp b/secure_tunneling/source/SecureTunnel.cpp
index b76d182e9..67173e470 100644
--- a/secure_tunneling/source/SecureTunnel.cpp
+++ b/secure_tunneling/source/SecureTunnel.cpp
@@ -491,7 +491,7 @@ namespace Aws
                   clientBootstrap,
                   socketOptions,
                   accessToken,
-                  nullptr,
+                  "",
                   localProxyMode,
                   endpointHost,
                   rootCa,
@@ -536,7 +536,7 @@ namespace Aws
                   Crt::ApiHandle::GetOrCreateStaticDefaultClientBootstrap(),
                   socketOptions,
                   accessToken,
-                  nullptr,
+                  "",
                   localProxyMode,
                   endpointHost,
                   rootCa,
@@ -768,6 +768,7 @@ namespace Aws
                         payload_buf.allocator = NULL;
                         payload_buf.buffer = message->payload->ptr;
                         payload_buf.len = message->payload->len;
+                        payload_buf.capacity = message->payload->len;
                         secureTunnel->m_OnDataReceive(payload_buf);
                         return;
                     }