diff --git a/library/Icinga/Application/Cli.php b/library/Icinga/Application/Cli.php
index 72b2b43f8..c5dfc092a 100644
--- a/library/Icinga/Application/Cli.php
+++ b/library/Icinga/Application/Cli.php
@@ -138,7 +138,7 @@ class Cli extends ApplicationBootstrap
 
     protected function dispatchOnce()
     {
-        $loader = new Loader($this);
+        $loader = $this->cliLoader();
         $loader->parseParams();
         $loader->dispatch();
         Benchmark::measure('All done');
@@ -149,7 +149,7 @@ class Cli extends ApplicationBootstrap
 
     protected function dispatchEndless()
     {
-        $loader = new Loader($this);
+        $loader = $this->cliLoader();
         $loader->parseParams();
         $screen = Screen::instance();