diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index 7ac37b7ee2..02da56e4f3 100644
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -428,7 +428,7 @@ static void rip_interface_clean(struct rip_interface *ri)
 	ri->enable_interface = 0;
 	ri->running = 0;
 
-	thread_cancel(&ri->t_wakeup);
+	THREAD_OFF(ri->t_wakeup);
 }
 
 void rip_interfaces_clean(struct rip *rip)
diff --git a/ripd/rip_peer.c b/ripd/rip_peer.c
index d3cee3de2f..a52914bcf9 100644
--- a/ripd/rip_peer.c
+++ b/ripd/rip_peer.c
@@ -84,7 +84,7 @@ static struct rip_peer *rip_peer_get(struct rip *rip, struct in_addr *addr)
 	peer = rip_peer_lookup(rip, addr);
 
 	if (peer) {
-		thread_cancel(&peer->t_timeout);
+		THREAD_OFF(peer->t_timeout);
 	} else {
 		peer = rip_peer_new();
 		peer->rip = rip;
diff --git a/ripd/ripd.c b/ripd/ripd.c
index e1793b082b..9798186036 100644
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -3526,7 +3526,7 @@ static void rip_instance_disable(struct rip *rip)
 	THREAD_OFF(rip->t_triggered_interval);
 
 	/* Cancel read thread. */
-	thread_cancel(&rip->t_read);
+	THREAD_OFF(rip->t_read);
 
 	/* Close RIP socket. */
 	close(rip->sock);