diff --git a/CHANGELOG.md b/CHANGELOG.md
index 919204d49..5ebaf95c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.7.99-feature
+## mm/dd/2022
+
+2. [](#improved)
+    * By default, add media to only pages which have been initialized in pages loop
+
 # v1.7.30
 ## mm/dd/2022
 
diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index 25f8ff6b6..be0660599 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -173,6 +173,15 @@ class Page implements PageInterface
         $this->taxonomy = [];
         $this->process = $config->get('system.pages.process');
         $this->published = true;
+        $this->_loadMedia = false;
+    }
+
+    /**
+     * @return void
+     */
+    public function enableMedia(): void
+    {
+        $this->_loadMedia = true;
     }
 
     /**
diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php
index 8ad2ccd8f..f9ca50e48 100644
--- a/system/src/Grav/Common/Page/Pages.php
+++ b/system/src/Grav/Common/Page/Pages.php
@@ -1788,6 +1788,7 @@ class Pages
     {
         $directory = rtrim($directory, DS);
         $page = new Page;
+        $page->enableMedia();
 
         /** @var Config $config */
         $config = $this->grav['config'];