diff --git a/Plugin.php b/Plugin.php
index 60bf2d9..f60b4c8 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -45,9 +45,9 @@ class Plugin extends PluginBase
         // Enable shortcodes on all pages if requested
         if (Settings::get('enable_on_render', false))
         {
-            Event::listen('cms.page.render', function($controller, $content) {
+            Event::listen('cms.page.postprocess', function($controller, $url, $page, $dataHolder) {
 
-                return \Shortcode::parse($content);
+                $dataHolder->content = \Shortcode::parse($dataHolder->content);
 
             });
         }