diff --git a/code/CMSMain.php b/code/CMSMain.php
index 8d17c9ba..a4d0000c 100644
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -795,11 +795,12 @@ HTML;
 	 *  - Send a status message
 	 */
 	function tellBrowserAboutPublicationChange($page, $statusMessage) {
-
 		$JS_title = Convert::raw2js($page->TreeTitle());
 
-		$JS_stageURL = Convert::raw2js(DB::query("SELECT URLSegment FROM SiteTree WHERE ID = $page->ID")->value());
-		$JS_liveURL = Convert::raw2js(DB::query("SELECT URLSegment FROM SiteTree_Live WHERE ID = $page->ID")->value());
+		$JS_stageURL = $page->DeletedFromStage ? '' : Convert::raw2js($page->AbsoluteLink());
+		$liveRecord = Versioned::get_one_by_stage('SiteTree', 'Live', "`SiteTree`.ID = $page->ID");
+		$JS_liveURL = $liveRecord ? Convert::raw2js($liveRecord->AbsoluteLink()) : '';
+
 		FormResponse::add($this->getActionUpdateJS($page));
 		FormResponse::update_status($page->Status);