diff --git a/api/src/dooris_api/app.py b/api/src/dooris_api/app.py
index 54f97f1..24cc708 100644
--- a/api/src/dooris_api/app.py
+++ b/api/src/dooris_api/app.py
@@ -29,7 +29,6 @@ async def lifespan(app: FastAPI):
         scope=app_cfg.openid_scope,
     )
 
-    # TODO: regularly re-query CCUJACK to discover new locks
     app.extra["ccujack"] = CCUJackClient(
         base_uri=app_cfg.ccujack_url,
         auth=BasicAuth(app_cfg.ccujack_user, app_cfg.ccujack_password),
diff --git a/api/src/dooris_api/ccujack.py b/api/src/dooris_api/ccujack.py
index 9edbcdb..1a6120a 100644
--- a/api/src/dooris_api/ccujack.py
+++ b/api/src/dooris_api/ccujack.py
@@ -104,6 +104,8 @@ class CCUJackClient:
         await asyncio.gather(self.mqtt.disconnect(), self.http.close())
         self.task_process_messages.cancel()
         self.task_process_messages = None
+        self.task.cron.cancel()
+        self.task.cron = None
 
     async def find_locks(self):
         logger.debug("Inspecting lock devices present in CCUJack")