diff --git a/src/adaptors/tcp/tcp_adaptor.c b/src/adaptors/tcp/tcp_adaptor.c
index 8ddfc30bf..566ac72f6 100644
--- a/src/adaptors/tcp/tcp_adaptor.c
+++ b/src/adaptors/tcp/tcp_adaptor.c
@@ -451,6 +451,7 @@ static int handle_incoming(qdr_tcp_connection_t *conn, const char *msg)
         qd_message_t *msg = qd_message();
 
         qd_message_set_streaming_annotation(msg);
+        qd_message_set_Q2_disabled_annotation(msg);
 
         qd_composed_field_t *props = qd_compose(QD_PERFORMATIVE_PROPERTIES, 0);
         qd_compose_start_list(props);
@@ -1972,8 +1973,6 @@ static uint64_t qdr_tcp_deliver(void *context, qdr_link_t *link, qdr_delivery_t
 {
     qd_message_t *msg = qdr_delivery_message(delivery);
 
-    // @TODO(kgiusti): determine why this is necessary to prevent window full stall:
-    qd_message_Q2_holdoff_disable(msg);
     void* link_context = qdr_link_get_context(link);
     if (link_context) {
         qdr_tcp_connection_t* tc = (qdr_tcp_connection_t*) link_context;
diff --git a/tests/system_tests_tcp_adaptor.py b/tests/system_tests_tcp_adaptor.py
index 766e981e9..ba8b50476 100644
--- a/tests/system_tests_tcp_adaptor.py
+++ b/tests/system_tests_tcp_adaptor.py
@@ -2438,7 +2438,6 @@ def __init__(self, msg, server_address, listener_address, service_address, dispo
         # listener. This initiates the ingress streaming request message.
         self.listener_address = listener_address
         self.client_conn = None
-        self.client_sent = False
 
     def done(self, error=None):
         self.error = error
@@ -2452,7 +2451,7 @@ def done(self, error=None):
 
     def timeout(self):
         self.timer = None
-        self.done(error=f"Timeout Expired: sent={self.sent}")
+        self.done(error=f"Timeout Expired: server_sent={self.server_sent}")
 
     def on_start(self, event):
         # Create an AMQP receiver for the service address. This will simulate a