diff --git a/src/vpp-api/python/vpp_papi/vpp_transport_socket.py b/src/vpp-api/python/vpp_papi/vpp_transport_socket.py
index 6e228e46e11..d26a3d47bf3 100644
--- a/src/vpp-api/python/vpp_papi/vpp_transport_socket.py
+++ b/src/vpp-api/python/vpp_papi/vpp_transport_socket.py
@@ -149,7 +149,7 @@ class VppTransport(object):
             self.socket.close()
         if self.sque is not None:
             self.sque.put(True)  # Terminate listening thread
-        if self.message_thread is not None:
+        if self.message_thread is not None and self.message_thread.is_alive():
             # Allow additional connect() calls.
             self.message_thread.join()
         # Collect garbage.