diff --git a/pkg/net/http/blademaster/server.go b/pkg/net/http/blademaster/server.go
index 20f817280..82cbb92c3 100644
--- a/pkg/net/http/blademaster/server.go
+++ b/pkg/net/http/blademaster/server.go
@@ -244,8 +244,8 @@ func (engine *Engine) prepareHandler(c *Context) {
 	httpMethod := c.Request.Method
 	rPath := c.Request.URL.Path
 	unescape := false
-	if engine.UseRawPath && len(c.Request.URL.RawPath) > 0 {
-		rPath = c.Request.URL.RawPath
+	if engine.UseRawPath && len(c.Request.URL.EscapedPath()) > 0 {
+		rPath = c.Request.URL.EscapedPath()
 		unescape = engine.UnescapePathValues
 	}
 	rPath = cleanPath(rPath)