1 files changed, 10 insertions, 0 deletions
diff --git a/ospfd/ospf_ase.c b/ospfd/ospf_ase.c
index 51da4a55a7..aaacebca14 100644
--- a/ospfd/ospf_ase.c
+++ b/ospfd/ospf_ase.c
@@ -609,6 +609,16 @@ static int ospf_ase_calculate_timer(struct thread *t)
 					+ (stop_time.tv_usec
 					   - start_time.tv_usec));
 	}
+
+	/*
+	 * Uninstall remnant routes that were installed before the restart, but
+	 * that are no longer valid.
+	 */
+	if (ospf->gr_info.finishing_restart) {
+		ospf_zebra_gr_disable(ospf);
+		ospf->gr_info.finishing_restart = false;
+	}
+
 	return 0;
 }