diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php
index cb358c4cf..9010afab2 100644
--- a/system/src/Grav/Common/Page/Pages.php
+++ b/system/src/Grav/Common/Page/Pages.php
@@ -1289,12 +1289,10 @@ class Pages
             static function (Event $event) use ($directory) {
                 $grav = Grav::instance();
                 [,$location,] = $grav['admin']->getRouteDetails();
-                if ($location !== 'pages') {
+                if ($location !== 'pages' || isset($grav['flex_objects'])) {
                     return;
                 }
 
-                $event->stopPropagation();
-
                 /** @var PageInterface $page */
                 $page = $event['page'];
                 $page->init(new \SplFileInfo('plugin://admin/pages/admin/error.md'));