diff --git a/src/connector/go b/src/connector/go
index 567b7b12f3fd2775c718d284beffc8c38dd6c219..8c58c512b6acda8bcdfa48fdc7140227b5221766 160000
--- a/src/connector/go
+++ b/src/connector/go
@@ -1 +1 @@
-Subproject commit 567b7b12f3fd2775c718d284beffc8c38dd6c219
+Subproject commit 8c58c512b6acda8bcdfa48fdc7140227b5221766
diff --git a/src/rpc/src/rpcTcp.c b/src/rpc/src/rpcTcp.c
index aacdede543ae1d4b04a7263b1dc7869e928655e1..46555b364770b412bf7524eb28352f807ff530a2 100644
--- a/src/rpc/src/rpcTcp.c
+++ b/src/rpc/src/rpcTcp.c
@@ -196,7 +196,7 @@ static void taosStopTcpThread(SThreadObj* pThreadObj) {
     }
   }
 
-  if (taosCheckPthreadValid(pThreadObj->thread)) pthread_join(pThreadObj->thread, NULL);
+  if (taosCheckPthreadValid(pThreadObj->thread) && pThreadObj->pollFd >= 0) pthread_join(pThreadObj->thread, NULL);
   if (fd != -1) taosCloseSocket(fd);
 }