diff --git a/plugins/system/sef/sef.php b/plugins/system/sef/sef.php
index 72151911e62df..fb6959c177d7c 100644
--- a/plugins/system/sef/sef.php
+++ b/plugins/system/sef/sef.php
@@ -36,7 +36,7 @@ public function onAfterRoute()
 
 		$router = $app::getRouter();
 
-		$uri     = clone JUri::getInstance();
+		$uri     = JUri::getInstance();
 		$domain  = $this->params->get('domain');
 
 		if ($domain === null || $domain === '')
@@ -44,11 +44,9 @@ public function onAfterRoute()
 			$domain = $uri->toString(array('scheme', 'host', 'port'));
 		}
 
-		$parsed = $router->parse($uri);
-		$fakelink = 'index.php?' . http_build_query($parsed);
-		$link = $domain . JRoute::_($fakelink, false);
+		$link = $domain . JRoute::_('index.php?' . http_build_query($router->getVars()), false);
 
-		if ($uri !== $link)
+		if ($uri->toString() !== $link)
 		{
 			$doc->addHeadLink(htmlspecialchars($link), 'canonical');
 		}