diff --git a/xds/internal/resolver/serviceconfig.go b/xds/internal/resolver/serviceconfig.go
index f8c8a9659..3ce5f1881 100644
--- a/xds/internal/resolver/serviceconfig.go
+++ b/xds/internal/resolver/serviceconfig.go
@@ -142,7 +142,7 @@ type erroringConfigSelector struct {
 }
 
 func newErroringConfigSelector(err error, xdsNodeID string) *erroringConfigSelector {
-	return &erroringConfigSelector{err: annotateErrorWithNodeID(status.Errorf(codes.Unavailable, err.Error()), xdsNodeID)}
+	return &erroringConfigSelector{err: annotateErrorWithNodeID(status.Error(codes.Unavailable, err.Error()), xdsNodeID)}
 }
 
 func (cs *erroringConfigSelector) SelectConfig(iresolver.RPCInfo) (*iresolver.RPCConfig, error) {
diff --git a/xds/server_test.go b/xds/server_test.go
index 205f2646d..13d01a7b9 100644
--- a/xds/server_test.go
+++ b/xds/server_test.go
@@ -701,9 +701,8 @@ func (s) TestServeAndCloseDoNotRace(t *testing.T) {
 	// resource error notifications for the invalid listener resource leading
 	// to service mode change to "not serving" each time.
 	//
-	// Even if the the server is currently NOT_SERVING, in the case (where we
-	// are NOT_SERVING and the new mode is also NOT_SERVING), the update is not
-	// suppressed as:
+	// Even if the server is currently NOT_SERVING and the new mode is also
+	// NOT_SERVING, the update is not suppressed as:
 	//   1. the error may have change
 	//   2. it provides a timestamp of the last backoff attempt
 	noopModeChangeCallback := func(_ net.Addr, _ ServingModeChangeArgs) {}