diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 7e9ed4160d..d223b9f750 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -562,6 +562,8 @@ static void ospf6_disable(struct ospf6 *o)
 		THREAD_OFF(o->t_ospf6_receive);
 		THREAD_OFF(o->t_external_aggr);
 		THREAD_OFF(o->gr_info.t_grace_period);
+		THREAD_OFF(o->t_write);
+		THREAD_OFF(o->t_abr_task);
 	}
 }
 
@@ -583,8 +585,6 @@ static int ospf6_maxage_remover(struct thread *thread)
 	struct listnode *i, *j, *k;
 	int reschedule = 0;
 
-	o->maxage_remover = (struct thread *)NULL;
-
 	for (ALL_LIST_ELEMENTS_RO(o->area_list, i, oa)) {
 		for (ALL_LIST_ELEMENTS_RO(oa->if_list, j, oi)) {
 			for (ALL_LIST_ELEMENTS_RO(oi->neighbor_list, k, on)) {