diff --git a/src/bot.py b/src/bot.py
index 5cead8b..1ece93c 100644
--- a/src/bot.py
+++ b/src/bot.py
@@ -161,6 +161,7 @@ async def main_loop():
                       "fandom_discussions": asyncio.create_task(discussions.tick_discussions(), name="fandom_discussions")}  # "discussion_handler": asyncio.create_task(discussion_handler()),
         main_tasks["msg_queue_shield"] = asyncio.shield(main_tasks["message_sender"])
         main_tasks["database_updates_shield"] = asyncio.shield(main_tasks["database_updates"])
+        main_tasks["task_tracker"] = asyncio.create_task(domains.task_tracker(), name="TaskTracer")
         await asyncio.gather(main_tasks["message_sender"], main_tasks["database_updates"])
     except KeyboardInterrupt:
         shutdown(loop)
diff --git a/src/domain_manager.py b/src/domain_manager.py
index 1cfe7cd..6475c8e 100644
--- a/src/domain_manager.py
+++ b/src/domain_manager.py
@@ -37,7 +37,6 @@ class DomainManager:
         self.domains: dict[str, Domain] = {}
         self.start_time: float = time.time()
         self.task_store: dict[str, asyncio.Task] = {}
-        asyncio.create_task(self.task_tracker(), name="TaskTracer")
 
     async def task_tracker(self, one_update=False):
         """Task tracer is supposed to keep track of all tasks spawned for /debug endpoint to show them.