diff --git a/pkg/client/options.go b/pkg/client/options.go
index 86da5ddfc3..33c460738c 100644
--- a/pkg/client/options.go
+++ b/pkg/client/options.go
@@ -644,6 +644,9 @@ type MatchingLabelsSelector struct {
 
 // ApplyToList applies this configuration to the given list options.
 func (m MatchingLabelsSelector) ApplyToList(opts *ListOptions) {
+	if m.Selector == nil {
+		m.Selector = labels.Nothing()
+	}
 	opts.LabelSelector = m
 }
 
@@ -677,6 +680,9 @@ type MatchingFieldsSelector struct {
 
 // ApplyToList applies this configuration to the given list options.
 func (m MatchingFieldsSelector) ApplyToList(opts *ListOptions) {
+	if m.Selector == nil {
+		m.Selector = fields.Nothing()
+	}
 	opts.FieldSelector = m
 }
 
diff --git a/pkg/client/options_test.go b/pkg/client/options_test.go
index e50669c691..0aa6a74007 100644
--- a/pkg/client/options_test.go
+++ b/pkg/client/options_test.go
@@ -36,12 +36,38 @@ var _ = Describe("ListOptions", func() {
 		o.ApplyToList(newListOpts)
 		Expect(newListOpts).To(Equal(o))
 	})
+	It("Should set LabelSelector with MatchingLabelsSelector", func() {
+		labelSelector, err := labels.Parse("a=b")
+		Expect(err).NotTo(HaveOccurred())
+		newListOpts := &client.ListOptions{}
+		newListOpts.ApplyOptions([]client.ListOption{client.MatchingLabelsSelector{Selector: labelSelector}})
+		expectedListOpts := &client.ListOptions{LabelSelector: client.MatchingLabelsSelector{Selector: labelSelector}}
+		Expect(newListOpts).To(Equal(expectedListOpts))
+	})
+	It("Should set LabelSelector to nothing with empty MatchingLabelsSelector", func() {
+		newListOpts := &client.ListOptions{}
+		newListOpts.ApplyOptions([]client.ListOption{client.MatchingLabelsSelector{}})
+		expectedListOpts := &client.ListOptions{LabelSelector: client.MatchingLabelsSelector{Selector: labels.Nothing()}}
+		Expect(newListOpts).To(Equal(expectedListOpts))
+	})
 	It("Should set FieldSelector", func() {
 		o := &client.ListOptions{FieldSelector: fields.Nothing()}
 		newListOpts := &client.ListOptions{}
 		o.ApplyToList(newListOpts)
 		Expect(newListOpts).To(Equal(o))
 	})
+	It("Should set FieldSelector with MatchingFieldsSelector", func() {
+		newListOpts := &client.ListOptions{}
+		newListOpts.ApplyOptions([]client.ListOption{client.MatchingFieldsSelector{Selector: fields.Nothing()}})
+		expectedListOpts := &client.ListOptions{FieldSelector: client.MatchingFieldsSelector{Selector: fields.Nothing()}}
+		Expect(newListOpts).To(Equal(expectedListOpts))
+	})
+	It("Should set FieldSelector to nothing with empty MatchingFieldsSelector", func() {
+		newListOpts := &client.ListOptions{}
+		newListOpts.ApplyOptions([]client.ListOption{client.MatchingFieldsSelector{}})
+		expectedListOpts := &client.ListOptions{FieldSelector: client.MatchingFieldsSelector{Selector: fields.Nothing()}}
+		Expect(newListOpts).To(Equal(expectedListOpts))
+	})
 	It("Should set Namespace", func() {
 		o := &client.ListOptions{Namespace: "my-ns"}
 		newListOpts := &client.ListOptions{}