diff --git a/heroku.yml b/heroku.yml
index 97728cdd..7b13190d 100644
--- a/heroku.yml
+++ b/heroku.yml
@@ -1,5 +1,3 @@
 build:
   docker:
     worker: Dockerfile
-run:
-  worker: python3 -m misskaty
diff --git a/misskaty/__init__.py b/misskaty/__init__.py
index 23243388..87889fea 100644
--- a/misskaty/__init__.py
+++ b/misskaty/__init__.py
@@ -1,6 +1,5 @@
 import time
 import pyromod.listen
-from database.nightmode_db import scheduler
 from logging import ERROR, INFO, FileHandler, StreamHandler, basicConfig, getLogger
 
 from pyrogram import Client
@@ -36,8 +35,6 @@ user = Client(
 
 app.start()
 user.start()
-if bool(scheduler.get_jobs()):
-    scheduler.start()
 bot = app.get_me()
 ubot = user.get_me()
 BOT_ID = bot.id
diff --git a/misskaty/__main__.py b/misskaty/__main__.py
index 5853d980..c1a2a4b4 100644
--- a/misskaty/__main__.py
+++ b/misskaty/__main__.py
@@ -18,6 +18,7 @@ from pyrogram.raw.all import layer
 from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup
 
 from database.users_chats_db import db
+from database.nightmode_db import scheduler
 from misskaty import (
     BOT_NAME,
     BOT_USERNAME,
@@ -76,6 +77,8 @@ async def start_bot():
             chat_id, message_id = pickle.load(status)
         os.remove("restart.pickle")
         await app.edit_message_text(chat_id=chat_id, message_id=message_id, text="<b>Bot restarted successfully!</b>")
+    if bool(scheduler.get_jobs()):
+        scheduler.start()
     asyncio.create_task(auto_clean())
     await idle()