diff --git a/server/server.go b/server/server.go
index fd0ebf1f..d83a4001 100644
--- a/server/server.go
+++ b/server/server.go
@@ -2554,17 +2554,11 @@ func (w *Watcher) Stop() {
 			}
 		}
 
-		w.ch.Close()
-		// make sure the loop function finishes
-		func() {
-			for {
-				select {
-				case <-w.realCh:
-				default:
-					return
-				}
-			}
-		}()
+		cleanInfiniteChannel(w.ch)
+		// the loop function goroutine might be blocked for
+		// writing to realCh. make sure it finishes.
+		for range w.realCh {
+		}
 	}
 }
 
diff --git a/server/server_test.go b/server/server_test.go
index 46ef4be3..c9f142f1 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -138,4 +138,9 @@ func TestMonitor(test *testing.T) {
 	assert.Equal(b.PathList[0].GetNlri().String(), "10.0.0.0/24")
 	assert.Equal(b.PathList[0].IsWithdraw, true)
 
+	if _, err := t.AddPath("", []*table.Path{table.NewPath(nil, bgp.NewIPAddrPrefix(24, "10.0.0.0"), true, attrs, time.Now(), false)}); err != nil {
+		log.Fatal(err)
+	}
+	//stop the watcher still having an item.
+	w.Stop()
 }