diff --git a/pkg/client/request.go b/pkg/client/request.go
index 0a4698c92ee..2bf56e768ab 100644
--- a/pkg/client/request.go
+++ b/pkg/client/request.go
@@ -180,6 +180,9 @@ func (r *Request) SelectorParam(paramName string, s labels.Selector) *Request {
 	if r.err != nil {
 		return r
 	}
+	if s.Empty() {
+		return r
+	}
 	return r.setParam(paramName, s.String())
 }
 
diff --git a/plugin/pkg/scheduler/factory/factory_test.go b/plugin/pkg/scheduler/factory/factory_test.go
index 3075775716a..6fe76fa8601 100644
--- a/plugin/pkg/scheduler/factory/factory_test.go
+++ b/plugin/pkg/scheduler/factory/factory_test.go
@@ -55,7 +55,7 @@ func TestCreateLists(t *testing.T) {
 	}{
 		// Minion
 		{
-			location: "/api/" + testapi.Version() + "/minions?fields=",
+			location: "/api/" + testapi.Version() + "/minions",
 			factory:  factory.createMinionLW,
 		},
 		// Assigned pod
@@ -95,15 +95,15 @@ func TestCreateWatches(t *testing.T) {
 		// Minion watch
 		{
 			rv:       "",
-			location: "/api/" + testapi.Version() + "/watch/minions?fields=&resourceVersion=",
+			location: "/api/" + testapi.Version() + "/watch/minions?resourceVersion=",
 			factory:  factory.createMinionLW,
 		}, {
 			rv:       "0",
-			location: "/api/" + testapi.Version() + "/watch/minions?fields=&resourceVersion=0",
+			location: "/api/" + testapi.Version() + "/watch/minions?resourceVersion=0",
 			factory:  factory.createMinionLW,
 		}, {
 			rv:       "42",
-			location: "/api/" + testapi.Version() + "/watch/minions?fields=&resourceVersion=42",
+			location: "/api/" + testapi.Version() + "/watch/minions?resourceVersion=42",
 			factory:  factory.createMinionLW,
 		},
 		// Assigned pod watches