diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index ed52a4a41..043086da7 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -237,8 +237,7 @@ class Context
 		if (in_array(self::$_instance->request_method, array('GET', 'POST', 'JSON')))
 		{
 			$method = $_SERVER['REQUEST_METHOD'] ?: 'GET';
-			$url = $_SERVER['REQUEST_URI'];
-			$route_info = Rhymix\Framework\Router::parseURL($method, $url, Rhymix\Framework\Router::getRewriteLevel());
+			$route_info = Rhymix\Framework\Router::parseURL($method, RX_REQUEST_URL, Rhymix\Framework\Router::getRewriteLevel());
 			self::setRequestArguments($route_info->args);
 			self::$_route_info = $route_info;
 		}
diff --git a/common/framework/router.php b/common/framework/router.php
index 1fd2427a5..3530f7c0a 100644
--- a/common/framework/router.php
+++ b/common/framework/router.php
@@ -113,12 +113,6 @@ class Router
 	 */
 	public static function parseURL(string $method, string $url, int $rewrite_level)
 	{
-		// Get the local part of the current URL.
-		if (starts_with(\RX_BASEURL, $url))
-		{
-			$url = substr($url, strlen(\RX_BASEURL));
-		}
-		
 		// Prepare the return object.
 		$result = new \stdClass;
 		$result->status = 200;
diff --git a/tests/unit/framework/RouterTest.php b/tests/unit/framework/RouterTest.php
index a31cf0311..a1f0cc923 100644
--- a/tests/unit/framework/RouterTest.php
+++ b/tests/unit/framework/RouterTest.php
@@ -73,8 +73,8 @@ class RouterTest extends \Codeception\TestCase\Test
         $args = array('mid' => 'board', 'document_srl' => '123');
         $this->assertEquals($args, Rhymix\Framework\Router::parseURL('GET', 'board/123', 1)->args);
         $this->assertEquals($args, Rhymix\Framework\Router::parseURL('GET', 'index.php?mid=board&document_srl=123', 0)->args);
-        $this->assertEquals($args, Rhymix\Framework\Router::parseURL('GET', \RX_BASEURL . 'board/123', 1)->args);
-        $this->assertEquals($args, Rhymix\Framework\Router::parseURL('GET', \RX_BASEURL . 'index.php?mid=board&document_srl=123', 0)->args);
+        $this->assertEquals($args, Rhymix\Framework\Router::parseURL('GET', 'board/123', 1)->args);
+        $this->assertEquals($args, Rhymix\Framework\Router::parseURL('GET', 'index.php?mid=board&document_srl=123', 0)->args);
         
         $args = array('mid' => 'board', 'act' => 'dispBoardModifyComment', 'comment_srl' => '456', 'extra_param' => 'foo bar');
         $this->assertEquals($args, Rhymix\Framework\Router::parseURL('GET', 'board/comment/456/edit?extra_param=foo+bar', 2)->args);