diff --git a/config/cms.php b/config/cms.php
index 4ef0703c1..74d924b76 100644
--- a/config/cms.php
+++ b/config/cms.php
@@ -253,7 +253,7 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Safe Mode
+    | Safe mode
     |--------------------------------------------------------------------------
     |
     | If safe mode is enabled, the PHP code section is disabled in the CMS
diff --git a/modules/cms/classes/CmsCompoundObject.php b/modules/cms/classes/CmsCompoundObject.php
index 9221c3396..2d1d6cc24 100644
--- a/modules/cms/classes/CmsCompoundObject.php
+++ b/modules/cms/classes/CmsCompoundObject.php
@@ -141,7 +141,7 @@ class CmsCompoundObject extends CmsObject
      */
     protected function checkSafeMode()
     {
-        $safeMode = Config::get('cms.enableSafeMode', false);
+        $safeMode = Config::get('cms.enableSafeMode', null);
         if ($safeMode === null) {
             $safeMode = !Config::get('app.debug', false);
         }