diff --git a/classes/Page.php b/classes/Page.php
index 1bd071b..7c24332 100644
--- a/classes/Page.php
+++ b/classes/Page.php
@@ -634,6 +634,13 @@ public function getProcessedMarkup()
             $markup = TextParser::parse($markup, $globalVars);
         }
 
+        /*
+         * Process content using core parser
+         */
+        if (class_exists(\Cms\Classes\PageLookup::class)) {
+            $markup = \Cms\Classes\PageLookup::processMarkup($markup);
+        }
+
         /*
          * Event hook
          */
diff --git a/updates/version.yaml b/updates/version.yaml
index 0b864d6..99dcc3b 100644
--- a/updates/version.yaml
+++ b/updates/version.yaml
@@ -71,3 +71,4 @@ v1.5.4: Compatibility updates
 v1.5.5: Fixes media finder added to menu in October v2
 v1.5.6: Fixes concurrency save form in October v3
 v1.5.7: Adds page finder support for October v3.2
+v1.5.8: Fixes resolving links used in static pages