diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index 037aeec288..d1c396a5be 100644
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -909,7 +909,7 @@ void bgp_close(void)
 	for (ALL_LIST_ELEMENTS(bm->listen_sockets, node, next, listener)) {
 		if (listener->bgp)
 			continue;
-		thread_cancel(listener->thread);
+		THREAD_OFF(listener->thread);
 		close(listener->fd);
 		listnode_delete(bm->listen_sockets, listener);
 		XFREE(MTYPE_BGP_LISTENER, listener->name);