diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 32cfa4d04c..adcaf64044 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -3766,6 +3766,9 @@ static void rib_meta_queue_gr_run_free(struct meta_queue *mq, struct list *l,
 			continue;
 
 		XFREE(MTYPE_WQ_WRAPPER, gr_run);
+		node->data = NULL;
+		list_delete_node(l, node);
+		mq->size--;
 	}
 }