diff --git a/app/Console/Commands/S3Cleanup.php b/app/Console/Commands/S3Cleanup.php
index cb5426a729f6..9b29ee692a63 100644
--- a/app/Console/Commands/S3Cleanup.php
+++ b/app/Console/Commands/S3Cleanup.php
@@ -43,7 +43,6 @@ class S3Cleanup extends Command
     public function handle()
     {
 
-
         if(!Ninja::isHosted())
             return;
         
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 14f046edecaf..00671b8fecda 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -94,7 +94,7 @@ class Kernel extends ConsoleKernel
 
         if(config('queue.default') == 'database' && Ninja::isSelfHost() && config('ninja.internal_queue_enabled') && !config('ninja.is_docker')) {
 
-            $schedule->command('queue:work')->everyMinute()->withoutOverlapping();
+            $schedule->command('queue:work database --stop-when-empty')->everyMinute()->withoutOverlapping();
 
             $schedule->command('queue:restart')->everyFiveMinutes()->withoutOverlapping();