diff --git a/go/vt/srvtopo/resilient_server.go b/go/vt/srvtopo/resilient_server.go
index 6dcd81e92ed..ed4548f5452 100644
--- a/go/vt/srvtopo/resilient_server.go
+++ b/go/vt/srvtopo/resilient_server.go
@@ -333,7 +333,7 @@ func (server *ResilientServer) WatchSrvVSchema(ctx context.Context, cell string,
 			} else {
 				for c := range changes {
 					// Note we forward topo.ErrNoNode as is.
-					callback(nil, c.Err)
+					callback(c.Value, c.Err)
 					if c.Err != nil {
 						log.Warningf("Error while watching vschema for cell %s (will wait 5s before retrying): %v", cell, c.Err)
 						break
diff --git a/go/vt/srvtopo/resilient_server_test.go b/go/vt/srvtopo/resilient_server_test.go
index 00e4fab2479..6e93cdfbbbd 100644
--- a/go/vt/srvtopo/resilient_server_test.go
+++ b/go/vt/srvtopo/resilient_server_test.go
@@ -236,7 +236,7 @@ func TestWatchSrvVSchema(t *testing.T) {
 	// Update value, wait for it.
 	updatedValue := &vschemapb.SrvVSchema{
 		Keyspaces: map[string]*vschemapb.Keyspace{
-			"ks1": {},
+			"ks2": {},
 		},
 	}
 	if err := ts.UpdateSrvVSchema(ctx, "test_cell", updatedValue); err != nil {