diff --git a/lib/filter_cli.c b/lib/filter_cli.c
index 7ef0d47f67..927cf4418e 100644
--- a/lib/filter_cli.c
+++ b/lib/filter_cli.c
@@ -1326,6 +1326,7 @@ DEFPY_YANG(
 				vty, "./ipv4-prefix-length-lesser-or-equal",
 				NB_OP_DESTROY, NULL);
 		}
+		nb_cli_enqueue_change(vty, "./any", NB_OP_DESTROY, NULL);
 	} else {
 		nb_cli_enqueue_change(vty, "./any", NB_OP_CREATE, NULL);
 	}
diff --git a/lib/filter_nb.c b/lib/filter_nb.c
index a14f232339..b5e3e5f65f 100644
--- a/lib/filter_nb.c
+++ b/lib/filter_nb.c
@@ -1630,7 +1630,7 @@ static int lib_prefix_list_entry_any_destroy(struct nb_cb_destroy_args *args)
 	/* Start prefix entry update procedure. */
 	prefix_list_entry_update_start(ple);
 
-	prefix_list_entry_set_empty(ple);
+	ple->any = false;
 
 	/* Finish prefix entry update procedure. */
 	prefix_list_entry_update_finish(ple);