diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index 0666b8fc4..4263a5731 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -705,16 +705,16 @@ class Page
         $pages = self::getGrav()['pages'];
 
         $blueprint = $pages->blueprints($this->blueprintName());
-
         $fields = $blueprint->fields();
+        $edit_mode = self::getGrav()['admin'] ? self::getGrav()['config']->get('plugins.admin.edit_mode') : null;
 
         // override if you only want 'normal' mode
-        if (empty($fields) && self::getGrav()['admin'] && self::getGrav()['config']->get('plugins.admin.edit_mode', 'auto') == 'normal') {
+        if (empty($fields) && ($edit_mode == 'auto' || $edit_mode == 'normal')) {
             $blueprint = $pages->blueprints('default');
         }
 
         // override if you only want 'expert' mode
-        if (!empty($fields) && self::getGrav()['admin'] && self::getGrav()['config']->get('plugins.admin.edit_mode', 'auto') == 'expert') {
+        if (!empty($fields) && $edit_mode == 'expert') {
             $blueprint = $pages->blueprints('');
         }