diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index d688c3133..4b16e05cd 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -3229,11 +3229,10 @@ class e107
 		if ($no_cbrace)	$e_QUERY = str_replace(array('{', '}', '%7B', '%7b', '%7D', '%7d'), '', rawurldecode($e_QUERY));
 		$e_QUERY = htmlentities(self::getParser()->post_toForm($e_QUERY));
 		
-		define('e_QUERY', $e_QUERY);	
-		
+		// e_QUERY SHOULD NOT BE DEFINED IF IN SNIGLE ENTRY MODE OR ALL URLS WILL BE BROKEN - it's defined later within the the router
 		if(!deftrue("e_SINGLE_ENTRY"))
 		{
-			
+			define('e_QUERY', $e_QUERY);	
 			$_SERVER['QUERY_STRING'] = e_QUERY;	
 		}