diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index 4025d20d..ece881b4 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -869,15 +869,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 
 		$this->extend('updateCurrentPageID', $id);
 
-		// Fall back to homepage record
-		if(!$id) {
-			$homepageSegment = RootURLController::get_homepage_link();
-			$homepageRecord = DataObject::get_one('SiteTree', array(
-				'"SiteTree"."URLSegment"' => $homepageSegment
-			));
-			if($homepageRecord) $id = $homepageRecord->ID;
-		}
-
 		return $id;
 	}