diff --git a/tunnel/intercept/svcpoll.go b/tunnel/intercept/svcpoll.go
index 40a5e7b37..61cd7fe23 100644
--- a/tunnel/intercept/svcpoll.go
+++ b/tunnel/intercept/svcpoll.go
@@ -143,7 +143,7 @@ func (self *ServiceListener) removeService(svc *entities.Service) {
 	if previousService != nil {
 		if previousService.ClientConfig != nil {
 			log.Infof("stopping tunnel for unavailable service: %s", previousService.Name)
-			useCnt := self.addresses[svc.ClientConfig.Hostname]
+			useCnt := self.addresses[previousService.ClientConfig.Hostname]
 			err := self.interceptor.StopIntercepting(previousService.Name, useCnt == 1)
 			if err != nil {
 				log.Errorf("failed to stop intercepting: %v", err)