diff --git a/app/vmselect/netstorage/netstorage.go b/app/vmselect/netstorage/netstorage.go
index 97dc453752..15522e0723 100644
--- a/app/vmselect/netstorage/netstorage.go
+++ b/app/vmselect/netstorage/netstorage.go
@@ -483,12 +483,6 @@ func GetGraphiteTags(filter string, limit int, deadline searchutils.Deadline) ([
 	if err != nil {
 		return nil, err
 	}
-	if len(filter) > 0 {
-		labels, err = applyGraphiteRegexpFilter(filter, labels)
-		if err != nil {
-			return nil, err
-		}
-	}
 	// Substitute "__name__" with "name" for Graphite compatibility
 	for i := range labels {
 		if labels[i] == "__name__" {
@@ -497,6 +491,12 @@ func GetGraphiteTags(filter string, limit int, deadline searchutils.Deadline) ([
 			break
 		}
 	}
+	if len(filter) > 0 {
+		labels, err = applyGraphiteRegexpFilter(filter, labels)
+		if err != nil {
+			return nil, err
+		}
+	}
 	if limit > 0 && limit < len(labels) {
 		labels = labels[:limit]
 	}