diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index 91747f868..916d99aca 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -1425,16 +1425,6 @@ class Page
             $this->modified = $var;
         }
 
-        if ($this->template == 'modular') {
-            foreach ($this->children() as $child) {
-                $modified = $child->modified();
-
-                if ($modified > $this->modified) {
-                    $this->modified = $modified;
-                }
-            }
-        }
-
         return $this->modified;
     }
 
diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php
index 7193db791..a6368ec17 100644
--- a/system/src/Grav/Common/Page/Pages.php
+++ b/system/src/Grav/Common/Page/Pages.php
@@ -790,6 +790,17 @@ class Pages
             $page->routable(false);
         }
 
+        // Override the modified time if modular
+        if ($page->template() == 'modular') {
+            foreach ($page->collection() as $child) {
+                $modified = $child->modified();
+
+                if ($modified > $last_modified) {
+                    $last_modified = $modified;
+                }
+            }
+        }
+
         // Override the modified and ID so that it takes the latest change into account
         $page->modified($last_modified);
         $page->id($last_modified.md5($page->filePath()));