diff --git a/pyagentx3/network.py b/pyagentx3/network.py
index fe8930f..d98e947 100644
--- a/pyagentx3/network.py
+++ b/pyagentx3/network.py
@@ -39,7 +39,7 @@ def __init__(self, queue, oid_list, sethandlers, agent_id, socket_path):
         self.socket = None
 
     def _connect(self):
-        while True:
+        while not self.stop.is_set():
             try:
                 logger.info("Try to open socket on ({})".format(self._socket_path))
                 self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
@@ -119,7 +119,7 @@ def recv_pdu(self):
     # =========================================
 
     def _get_updates(self):
-        while True:
+        while not self.stop.is_set():
             try:
                 item = self._queue.get_nowait()
                 #logger.info('Update: {}'.format(item))
@@ -219,7 +219,7 @@ def _start_network(self):
             pdu = self.recv_pdu()
 
         logger.info("==== Waiting for PDU ====")
-        while True:
+        while not self.stop.is_set():
             try:
                 self._get_updates()
                 request = self.recv_pdu()
diff --git a/pyagentx3/updater.py b/pyagentx3/updater.py
index 401995c..c0824d6 100644
--- a/pyagentx3/updater.py
+++ b/pyagentx3/updater.py
@@ -38,9 +38,7 @@ def agent_setup(self, queue, oid, freq):
 
     def run(self):
         start_time = 0
-        while True:
-            if self.stop.is_set():
-                break
+        while not self.stop.is_set():
             now = time.time()
             if now - start_time > self._freq:
                 logger.info('Updating : %s (%s)', self.__class__.__name__, self._oid)