diff --git a/app/vmselect/main.go b/app/vmselect/main.go
index 2be5d1ee5..659cafde3 100644
--- a/app/vmselect/main.go
+++ b/app/vmselect/main.go
@@ -119,7 +119,7 @@ func RequestHandler(w http.ResponseWriter, r *http.Request) bool {
 	}
 
 	if strings.HasPrefix(path, "/api/v1/label/") {
-		s := r.URL.Path[len("/api/v1/label/"):]
+		s := path[len("/api/v1/label/"):]
 		if strings.HasSuffix(s, "/values") {
 			labelValuesRequests.Inc()
 			labelName := s[:len(s)-len("/values")]
@@ -133,7 +133,7 @@ func RequestHandler(w http.ResponseWriter, r *http.Request) bool {
 		}
 	}
 	if strings.HasPrefix(path, "/tags/") && !isGraphiteTagsPath(path) {
-		tagName := r.URL.Path[len("/tags/"):]
+		tagName := path[len("/tags/"):]
 		graphiteTagValuesRequests.Inc()
 		if err := graphite.TagValuesHandler(startTime, tagName, w, r); err != nil {
 			graphiteTagValuesErrors.Inc()