diff --git a/vio/vio.cc b/vio/vio.cc
index f2007bbc928..220406f1d8b 100644
--- a/vio/vio.cc
+++ b/vio/vio.cc
@@ -363,6 +363,10 @@ bool vio_reset(Vio *vio, enum enum_vio_type type, my_socket sd,
   /* Preserve perfschema info for this connection */
   new_vio.mysql_socket.m_psi = vio->mysql_socket.m_psi;
 
+  /* Preserve thread_id & signal_mask for this connection */
+  new_vio.thread_id = vio->thread_id;
+  new_vio.signal_mask = vio->signal_mask;
+
 #ifdef HAVE_OPENSSL
   new_vio.ssl_arg = ssl;
 #endif