diff --git a/client/internal/routemanager/client/client.go b/client/internal/routemanager/client/client.go
index c9f0c68d3..579525ea8 100644
--- a/client/internal/routemanager/client/client.go
+++ b/client/internal/routemanager/client/client.go
@@ -489,6 +489,9 @@ func (w *Watcher) Stop() {
 
 	w.cancel()
 
+        if w.currentChosen == nil {
+            return
+        }
 	if err := w.removeAllowedIPs(w.currentChosen, reasonShutdown); err != nil {
 		log.Errorf("Failed to remove routes for [%v]: %v", w.handler, err)
 	}