diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index b472bf3a7442..c4e4afdf9e24 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -19,6 +19,7 @@ use App\Jobs\Ledger\LedgerBalanceUpdate;
 use App\Jobs\Ninja\AdjustEmailQuota;
 use App\Jobs\Ninja\CompanySizeCheck;
 use App\Jobs\Ninja\QueueSize;
+use App\Jobs\Ninja\TaskScheduler;
 use App\Jobs\Util\DiskCleanup;
 use App\Jobs\Util\ReminderJob;
 use App\Jobs\Util\SchedulerCheck;
@@ -69,17 +70,18 @@ class Kernel extends ConsoleKernel
 
         $schedule->job(new RecurringExpensesCron)->dailyAt('00:10')->withoutOverlapping();
 
-        $schedule->job(new AutoBillCron)->dailyAt('06:00')->withoutOverlapping();        
+        $schedule->job(new AutoBillCron)->dailyAt('06:00')->withoutOverlapping();
 
         $schedule->job(new SchedulerCheck)->daily()->withoutOverlapping();
 
-        if(Ninja::isSelfHost())
-        {
+        $schedule->job(new TaskScheduler())->daily()->withoutOverlapping();
+
+        if (Ninja::isSelfHost()) {
 
             $schedule->call(function () {
                 Account::whereNotNull('id')->update(['is_scheduler_running' => true]);
-            })->everyFiveMinutes(); 
-            
+            })->everyFiveMinutes();
+
         }
 
         /* Run hosted specific jobs */
@@ -97,12 +99,12 @@ class Kernel extends ConsoleKernel
 
         }
 
-        if(config('queue.default') == 'database' && Ninja::isSelfHost() && config('ninja.internal_queue_enabled') && !config('ninja.is_docker')) {
+        if (config('queue.default') == 'database' && Ninja::isSelfHost() && config('ninja.internal_queue_enabled') && !config('ninja.is_docker')) {
 
             $schedule->command('queue:work database --stop-when-empty')->everyMinute()->withoutOverlapping();
 
-            $schedule->command('queue:restart')->everyFiveMinutes()->withoutOverlapping(); 
-            
+            $schedule->command('queue:restart')->everyFiveMinutes()->withoutOverlapping();
+
         }
 
     }
@@ -114,7 +116,7 @@ class Kernel extends ConsoleKernel
      */
     protected function commands()
     {
-        $this->load(__DIR__.'/Commands');
+        $this->load(__DIR__ . '/Commands');
 
         require base_path('routes/console.php');
     }