diff --git a/discovery.php b/discovery.php
index a8e48c6495..e56f104bf6 100755
--- a/discovery.php
+++ b/discovery.php
@@ -108,6 +108,7 @@ if ($config['distributed_poller'] === true) {
 foreach (dbFetch("SELECT * FROM `devices` WHERE status = 1 AND disabled = 0 $where ORDER BY device_id DESC") as $device) {
     if (dbGetLock('discovering.' . $device['device_id'])) {
         discover_device($device, $options);
+        dbReleaseLock('discovering.' . $device['device_id']);
     }
 }
 
diff --git a/poller.php b/poller.php
index 8c2b32881e..57132457d7 100755
--- a/poller.php
+++ b/poller.php
@@ -114,6 +114,7 @@ foreach (dbFetch($query) as $device) {
         poll_device($device, $options);
         RunRules($device['device_id']);
         echo "\r\n";
+        dbReleaseLock('polling.' . $device['device_id']);
     }
     $polled_devices++;
 }