diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php
index dd5c3496f3..9027951dc5 100755
--- a/code/Model/SiteTree.php
+++ b/code/Model/SiteTree.php
@@ -735,13 +735,15 @@ public function getAbsoluteLiveLink($includeStageEqualsLive = true)
     /**
      * Generates a link to edit this page in the CMS.
      *
+     * Implemented here to satisfy the CMSPreviewable interface, but data is intended to be loaded via Extension
+     *
+     * @see SilverStripe\Admin\CMSEditLinkExtension
+     *
      * @return string
      */
     public function CMSEditLink()
     {
-        // This method has to be implemented here to satisfy the CMSPreviewable interface.
-        // See the actual implementation in CMSEditLinkExtension.
-        return $this->extend('CMSEditLink')[0];
+        return $this->extend('CMSEditLink')[0] ?? '';
     }
 
     /**
diff --git a/composer.json b/composer.json
index fa88bc55bd..1147bdc029 100644
--- a/composer.json
+++ b/composer.json
@@ -55,4 +55,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
+}
\ No newline at end of file