diff --git a/poller-service.py b/poller-service.py
index 6c5fd2c88..c5fed7077 100755
--- a/poller-service.py
+++ b/poller-service.py
@@ -250,7 +250,8 @@ dev_query = ('SELECT device_id, status,
              ') as next_discovery                                                '
              'FROM devices WHERE                                                 '
              'disabled = 0                                                       '
-             'AND IS_FREE_LOCK(CONCAT("polling.", device_id))                    '
+             'AND IS_FREE_LOCK(CONCAT("poll.", device_id))                       '
+             'AND IS_FREE_LOCK(CONCAT("discovery.", device_id))                       '
              'AND ( last_poll_attempted < DATE_SUB(NOW(), INTERVAL {2} SECOND )  '
              '  OR last_poll_attempted IS NULL )                                 '
              '{3}                                                                '