diff --git a/app/Providers/Queue.php b/app/Providers/Queue.php
index 659554a10d8..cda8f88533f 100644
--- a/app/Providers/Queue.php
+++ b/app/Providers/Queue.php
@@ -56,7 +56,10 @@ public function boot()
 
             $company->makeCurrent();
 
-            $this->registerModules();
+            // TODO: Move queue control at the beginning of the closure
+            if (should_queue()) {
+                $this->registerModules();
+            }
         });
 
         app('events')->listen(JobFailed::class, function ($event) {