1 files changed, 6 insertions, 10 deletions

diff --git a/plugins/Monolog/config/tracker.php b/plugins/Monolog/config/tracker.php
index 620101ff7a..bb7820f9f1 100644
--- a/plugins/Monolog/config/tracker.php
+++ b/plugins/Monolog/config/tracker.php
@@ -10,17 +10,13 @@ function isTrackerDebugEnabled(ContainerInterface $c)
 
 return array(
 
-    'Psr\Log\LoggerInterface' => \DI\decorate(function ($previous, ContainerInterface $c) {
-        if (isTrackerDebugEnabled($c)) {
-            return $previous;
-        } else {
-            return new \Psr\Log\NullLogger();
-        }
-    }),
-
-    'log.handler.classes' => DI\decorate(function ($previous) {
-        if (isset($previous['screen'])) {
+    'log.handler.classes' => DI\decorate(function ($previous, ContainerInterface $c) {
+        if (isset($previous['screen'])
+            && isTrackerDebugEnabled($c)
+        ) {
             $previous['screen'] = 'Piwik\Plugins\Monolog\Handler\EchoHandler';
+        } else {
+            unset($previous['screen']);
         }
 
         return $previous;