diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index eb152277e..a260ec95f 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -137,8 +137,6 @@ class Grav extends Container
         $debugger = $this['debugger'];
         $debugger->render();
 
-        $this->fireEvent('onOutputRendered');
-
         register_shutdown_function([$this, 'shutdown']);
     }
 
diff --git a/system/src/Grav/Common/Processors/RenderProcessor.php b/system/src/Grav/Common/Processors/RenderProcessor.php
index 3248b4e4d..9f393bbc4 100644
--- a/system/src/Grav/Common/Processors/RenderProcessor.php
+++ b/system/src/Grav/Common/Processors/RenderProcessor.php
@@ -32,6 +32,8 @@ class RenderProcessor extends ProcessorBase implements ProcessorInterface
 
             // remove any output
             $container->output = '';
+
+            $this->fireEvent('onOutputRendered');
         }
     }
 }