diff --git a/app/api_topologies.go b/app/api_topologies.go
index 7787fbe73e..15b0940444 100644
--- a/app/api_topologies.go
+++ b/app/api_topologies.go
@@ -23,8 +23,8 @@ var (
 			renderer: render.PodRenderer,
 			Name:     "Pods",
 			Options: map[string][]APITopologyOption{"system": {
-				{"show", "System containers shown", false, render.FilterNoop},
-				{"hide", "System containers hidden", true, render.FilterSystem},
+				{"show", "System pods shown", false, render.FilterNoop},
+				{"hide", "System pods hidden", true, render.FilterSystem},
 			}},
 		},
 		{
@@ -33,8 +33,8 @@ var (
 			renderer: render.PodServiceRenderer,
 			Name:     "by service",
 			Options: map[string][]APITopologyOption{"system": {
-				{"show", "System containers shown", false, render.FilterNoop},
-				{"hide", "System containers hidden", true, render.FilterSystem},
+				{"show", "System services shown", false, render.FilterNoop},
+				{"hide", "System services hidden", true, render.FilterSystem},
 			}},
 		},
 	}
diff --git a/probe/kubernetes/service.go b/probe/kubernetes/service.go
index 0717f27f5f..c9a17d4a3c 100644
--- a/probe/kubernetes/service.go
+++ b/probe/kubernetes/service.go
@@ -46,6 +46,9 @@ func (s *service) Namespace() string {
 }
 
 func (s *service) Selector() labels.Selector {
+	if s.Spec.Selector == nil {
+		return labels.Nothing()
+	}
 	return labels.SelectorFromSet(labels.Set(s.Spec.Selector))
 }