diff --git a/zebra/interface.c b/zebra/interface.c
index 96e378444d..93ffeb437c 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -184,13 +184,6 @@ static int if_zebra_new_hook(struct interface *ifp)
 static void if_nhg_dependents_check_valid(struct nhg_hash_entry *nhe)
 {
 	zebra_nhg_check_valid(nhe);
-	if (!CHECK_FLAG(nhe->flags, NEXTHOP_GROUP_VALID)) {
-		/* If we're in shutdown, this interface event needs to clean
-		 * up installed NHGs, so don't clear that flag directly.
-		 */
-		if (!zrouter.in_shutdown)
-			UNSET_FLAG(nhe->flags, NEXTHOP_GROUP_INSTALLED);
-	}
 }
 
 static void if_down_nhg_dependents(const struct interface *ifp)
diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c
index 500f4b0f1b..e27078d138 100644
--- a/zebra/zebra_nhg.c
+++ b/zebra/zebra_nhg.c
@@ -1055,6 +1055,12 @@ static void zebra_nhg_set_invalid(struct nhg_hash_entry *nhe)
 
 	UNSET_FLAG(nhe->flags, NEXTHOP_GROUP_VALID);
 
+	/* If we're in shutdown, this interface event needs to clean
+	 * up installed NHGs, so don't clear that flag directly.
+	 */
+	if (!zrouter.in_shutdown)
+		UNSET_FLAG(nhe->flags, NEXTHOP_GROUP_INSTALLED);
+
 	/* Update validity of nexthops depending on it */
 	frr_each(nhg_connected_tree, &nhe->nhg_dependents, rb_node_dep)
 		zebra_nhg_check_valid(rb_node_dep->nhe);