diff --git a/modules/context/context.go b/modules/context/context.go
index 94e1f6cfffc7..503885064992 100644
--- a/modules/context/context.go
+++ b/modules/context/context.go
@@ -610,9 +610,6 @@ func Contexter() func(next http.Handler) http.Handler {
 			var startTime = time.Now()
 			var link = setting.AppSubURL + strings.TrimSuffix(req.URL.EscapedPath(), "/")
 
-			chiCtx := chi.RouteContext(req.Context())
-			chiCtx.RoutePath = req.URL.EscapedPath()
-
 			var ctx = Context{
 				Resp:    NewResponse(resp),
 				Cache:   mc.GetCache(),
diff --git a/routers/common/middleware.go b/routers/common/middleware.go
index 7da05d2ae4ef..3f535628aa30 100644
--- a/routers/common/middleware.go
+++ b/routers/common/middleware.go
@@ -23,6 +23,9 @@ func Middlewares() []func(http.Handler) http.Handler {
 	var handlers = []func(http.Handler) http.Handler{
 		func(next http.Handler) http.Handler {
 			return http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
+				// First of all escape the URL RawPath to ensure that all routing is done using a correctly escaped URL
+				req.URL.RawPath = req.URL.EscapedPath()
+
 				ctx, _, finished := process.GetManager().AddContext(req.Context(), fmt.Sprintf("%s: %s", req.Method, req.RequestURI))
 				defer finished()
 				next.ServeHTTP(context.NewResponse(resp), req.WithContext(ctx))
diff --git a/routers/web/web.go b/routers/web/web.go
index ebd0995df837..23daeb601f94 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -1079,11 +1079,6 @@ func RegisterRoutes(m *web.Route) {
 		m.Get("/swagger.v1.json", SwaggerV1Json)
 	}
 	m.NotFound(func(w http.ResponseWriter, req *http.Request) {
-		escapedPath := req.URL.EscapedPath()
-		if len(escapedPath) > 1 && escapedPath[len(escapedPath)-1] == '/' {
-			http.Redirect(w, req, setting.AppSubURL+escapedPath[:len(escapedPath)-1], http.StatusTemporaryRedirect)
-			return
-		}
 		ctx := context.GetContext(req)
 		ctx.NotFound("", nil)
 	})