diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 8cdb22585ac..64a6e898f06 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -3307,7 +3307,9 @@ HttpSM::tunnel_handler_ua(int event, HttpTunnelConsumer *c)
       ua_txn->set_half_close_flag(true);
     }
 
+    vc_table.remove_entry(this->ua_entry);
     ua_txn->do_io_close();
+    ua_txn = nullptr;
   } else {
     ink_assert(ua_buffer_reader != nullptr);
     ua_txn->release(ua_buffer_reader);