diff --git a/src/Nancy.Hosting.Self/NancyHost.cs b/src/Nancy.Hosting.Self/NancyHost.cs
index d04601f16b..d3aca3d94c 100644
--- a/src/Nancy.Hosting.Self/NancyHost.cs
+++ b/src/Nancy.Hosting.Self/NancyHost.cs
@@ -252,7 +252,6 @@ private Request ConvertRequestToNancyRequest(HttpListenerRequest request)
             var expectedRequestLength =
                 GetExpectedRequestLength(request.Headers.ToDictionary());
 
-            var relativeUrl = baseUri.MakeAppLocalPath(request.Url);
 
             var nancyUrl = new Url
             {
@@ -260,8 +259,8 @@ private Request ConvertRequestToNancyRequest(HttpListenerRequest request)
                 HostName = request.Url.Host,
                 Port = request.Url.IsDefaultPort ? null : (int?)request.Url.Port,
                 BasePath = baseUri.AbsolutePath.TrimEnd('/'),
-                Path = HttpUtility.UrlDecode(relativeUrl),
-                Query = request.Url.Query,
+                Path = baseUri.MakeAppLocalPath(request.Url),
+                Query = request.Url.Query
             };
 
             byte[] certificate = null;