diff --git a/services/tasks/src/queues/geocode-move.js b/services/tasks/src/queues/geocode-move.js
index c83ad53..3028b36 100644
--- a/services/tasks/src/queues/geocode-move.js
+++ b/services/tasks/src/queues/geocode-move.js
@@ -112,6 +112,8 @@ module.exports = async function () {
               "location" = ${deviceSqlGeopoint}
             WHERE
               "device_id" = ${deviceId}
+              AND "state" = 'open'
+              AND "follow_location" = TRUE
             `
         },
       ])