diff --git a/pkg/naming/discovery/discovery.go b/pkg/naming/discovery/discovery.go
index 088304d25..5b8c8c241 100644
--- a/pkg/naming/discovery/discovery.go
+++ b/pkg/naming/discovery/discovery.go
@@ -601,7 +601,9 @@ func (d *Discovery) polls(ctx context.Context) (apps map[string]*naming.Instance
 	}
 	if err = d.httpClient.Get(ctx, uri, "", params, res); err != nil {
 		d.switchNode()
-		log.Error("discovery: client.Get(%s) error(%+v)", uri+"?"+params.Encode(), err)
+		if ctx.Err() != context.Canceled {
+			log.Error("discovery: client.Get(%s) error(%+v)", uri+"?"+params.Encode(), err)
+		}
 		return
 	}
 	if ec := ecode.Int(res.Code); !ecode.Equal(ecode.OK, ec) {