diff --git a/src/Extensions/SiteTreeSubsites.php b/src/Extensions/SiteTreeSubsites.php
index 54ae02e3..a4aefa80 100644
--- a/src/Extensions/SiteTreeSubsites.php
+++ b/src/Extensions/SiteTreeSubsites.php
@@ -124,7 +124,7 @@ protected function updateCMSFields(FieldList $fields)
             $subsitesMap = new Map(ArrayList::create());
         }
 
-        $viewingPageHistory = Controller::has_curr() && Controller::curr() instanceof HistoryViewerController;
+        $viewingPageHistory = Controller::curr() instanceof HistoryViewerController;
 
         // Master page edit field (only allowed from default subsite to avoid inconsistent relationships)
         $isDefaultSubsite = $this->owner->SubsiteID == 0 || $this->owner->Subsite()->DefaultSite;
diff --git a/src/Pages/SubsitesVirtualPage.php b/src/Pages/SubsitesVirtualPage.php
index a9198198..1eef7a63 100644
--- a/src/Pages/SubsitesVirtualPage.php
+++ b/src/Pages/SubsitesVirtualPage.php
@@ -56,8 +56,9 @@ public function getCMSFields()
                 'ID',
                 'MenuTitle'
             );
-            if (Controller::has_curr() && Controller::curr()->getRequest()) {
-                $subsiteID = (int) Controller::curr()->getRequest()->requestVar('CopyContentFromID_SubsiteID');
+            $request = Controller::curr()?->getRequest();
+            if ($request) {
+                $subsiteID = (int) $request->requestVar('CopyContentFromID_SubsiteID');
                 $pageSelectionField->setSubsiteID($subsiteID);
             }
             $fields->replaceField('CopyContentFromID', $pageSelectionField);