diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php
index e05b4add4..04679aded 100644
--- a/lib/Cake/Routing/Router.php
+++ b/lib/Cake/Routing/Router.php
@@ -820,7 +820,7 @@ class Router {
  * @see Router::url()
  */
 	protected static function _handleNoRoute($url) {
-		$named = $args = $query = array();
+		$named = $args = array();
 		$skip = array_merge(
 			array('bare', 'action', 'controller', 'plugin', 'prefix'),
 			self::$_prefixes
@@ -847,7 +847,7 @@ class Router {
 			}
 		}
 
-		if (empty($named) && empty($args) && empty($query) && (!isset($url['action']) || $url['action'] === 'index')) {
+		if (empty($named) && empty($args) && (!isset($url['action']) || $url['action'] === 'index')) {
 			$url['action'] = null;
 		}
 
@@ -881,9 +881,6 @@ class Router {
 				}
 			}
 		}
-		if (!empty($query)) {
-			$output .= Router::queryString($query);
-		}
 		return $output;
 	}