diff --git a/confluent_server/confluent/plugins/hardwaremanagement/enclosure.py b/confluent_server/confluent/plugins/hardwaremanagement/enclosure.py
index a59422c0..c835c852 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/enclosure.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/enclosure.py
@@ -59,9 +59,12 @@ def update(nodes, element, configmanager, inputdata):
     for encmgr in baysbyencmgr:
         gp.spawn_n(reseat_bays, encmgr, baysbyencmgr[encmgr], configmanager, rspq)
     while gp.running():
-        nrsp = rspq.get()
-        if nrsp is not None:
-            yield nrsp
+        try:
+            nrsp = rspq.get(timeout=0.1)
+            if nrsp is not None:
+                yield nrsp
+        except queue.Empty:
+            continue
     while not rspq.empty():
         nrsp = rspq.get()
         if nrsp is not None:
diff --git a/confluent_server/confluent/plugins/hardwaremanagement/pdu.py b/confluent_server/confluent/plugins/hardwaremanagement/pdu.py
index 3db21636..d3c0f049 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/pdu.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/pdu.py
@@ -53,9 +53,12 @@ def retrieve(nodes, element, configmanager, inputdata):
         for pdu in relpdus:
             gp.spawn(readpdu, pdu, relpdus[pdu], configmanager, rspq)
         while gp.running():
-            nrsp = rspq.get()
-            if not isinstance(nrsp, TaskDone):
+            try:
+                nrsp = rspq.get(timeout=0.1)
+            if nrsp is not None and not isinstance(nrsp, TaskDone):
                 yield nrsp
+            except queue.Empty:
+                continue
         while not rspq.empty():
             nrsp = rspq.get()
             if not isinstance(nrsp, TaskDone):
@@ -115,9 +118,12 @@ def update(nodes, element, configmanager, inputdata):
     for pdu in relpdus:
         gp.spawn(updatepdu, pdu, relpdus[pdu], configmanager, inputdata, rspq)
     while gp.running():
-        nrsp = rspq.get()
-        if not isinstance(nrsp, TaskDone):
-            yield nrsp
+        try:
+            nrsp = rspq.get(timeout=0.1)
+            if nrsp is not None and not isinstance(nrsp, TaskDone):
+                yield nrsp
+        except queue.Empty:
+            continue
     while not rspq.empty():
         nrsp = rspq.get()
         if not isinstance(nrsp, TaskDone):