diff --git a/pkg/registry/service/rest.go b/pkg/registry/service/rest.go
index 3ee91f16b4c..075d3d84ac7 100644
--- a/pkg/registry/service/rest.go
+++ b/pkg/registry/service/rest.go
@@ -295,6 +295,9 @@ func (rs *REST) ResourceLocation(ctx api.Context, id string) (*url.URL, http.Rou
 	// Find a Subset that has the port.
 	for ssi := 0; ssi < len(eps.Subsets); ssi++ {
 		ss := &eps.Subsets[(ssSeed+ssi)%len(eps.Subsets)]
+		if len(ss.Addresses) == 0 {
+			continue
+		}
 		for i := range ss.Ports {
 			if ss.Ports[i].Name == portStr {
 				// Pick a random address.
diff --git a/pkg/registry/service/rest_test.go b/pkg/registry/service/rest_test.go
index 1271e3285b0..2f7e76e1619 100644
--- a/pkg/registry/service/rest_test.go
+++ b/pkg/registry/service/rest_test.go
@@ -440,6 +440,22 @@ func TestServiceRegistryResourceLocation(t *testing.T) {
 					Ports:     []api.EndpointPort{{Name: "", Port: 80}, {Name: "p", Port: 93}},
 				}},
 			},
+			{
+				ObjectMeta: api.ObjectMeta{
+					Name:      "foo",
+					Namespace: api.NamespaceDefault,
+				},
+				Subsets: []api.EndpointSubset{{
+					Addresses: []api.EndpointAddress{},
+					Ports:     []api.EndpointPort{{Name: "", Port: 80}, {Name: "p", Port: 93}},
+				}, {
+					Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
+					Ports:     []api.EndpointPort{{Name: "", Port: 80}, {Name: "p", Port: 93}},
+				}, {
+					Addresses: []api.EndpointAddress{{IP: "1.2.3.5"}},
+					Ports:     []api.EndpointPort{},
+				}},
+			},
 		},
 	}
 	storage, registry := NewTestREST(t, endpoints)
diff --git a/test/e2e/autoscaling.go b/test/e2e/autoscaling.go
index 56bb1fca0e5..f6d54c0bb45 100644
--- a/test/e2e/autoscaling.go
+++ b/test/e2e/autoscaling.go
@@ -57,7 +57,7 @@ var _ = Describe("Autoscaling", func() {
 
 		// Consume 60% CPU
 		millicoresPerReplica := 600
-		rc := NewStaticResourceConsumer("cpu-utilization", nodeCount*coresPerNode, millicoresPerReplica*nodeCount*coresPerNode, 0, int64(millicoresPerReplica), 100, f)
+		rc := NewStaticResourceConsumer("rc", nodeCount*coresPerNode, millicoresPerReplica*nodeCount*coresPerNode, 0, int64(millicoresPerReplica), 100, f)
 		expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute))
 
 		rc.CleanUp()
@@ -79,7 +79,7 @@ var _ = Describe("Autoscaling", func() {
 
 		// Consume 60% of total memory capacity
 		megabytesPerReplica := int(memCapacityMb * 6 / 10 / coresPerNode)
-		rc := NewStaticResourceConsumer("mem-utilization", nodeCount*coresPerNode, 0, megabytesPerReplica*nodeCount*coresPerNode, 100, int64(megabytesPerReplica+100), f)
+		rc := NewStaticResourceConsumer("rc", nodeCount*coresPerNode, 0, megabytesPerReplica*nodeCount*coresPerNode, 100, int64(megabytesPerReplica+100), f)
 		expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute))
 
 		rc.CleanUp()
diff --git a/test/e2e/autoscaling_utils.go b/test/e2e/autoscaling_utils.go
index 389b6352f72..9a05d104097 100644
--- a/test/e2e/autoscaling_utils.go
+++ b/test/e2e/autoscaling_utils.go
@@ -262,6 +262,4 @@ func runServiceAndRCForResourceConsumer(c *client.Client, ns, name string, repli
 		MemLimit:  memLimitMb * 1024 * 1024, // MemLimit is in bytes
 	}
 	expectNoError(RunRC(config))
-	// Wait until endpoints are processed. Temporary workaround until #14477 is fixed.
-	time.Sleep(10 * time.Second)
 }