diff --git a/main/data.c b/main/data.c
index b4675c298d..9bf1cab267 100644
--- a/main/data.c
+++ b/main/data.c
@@ -1631,7 +1631,7 @@ static void data_filter_destructor(void *obj)
 {
 	struct data_filter *filter = obj, *globres;
 
-	AST_LIST_TRAVERSE(&(filter->glob_list), globres, list) {
+	while ((globres = AST_LIST_REMOVE_HEAD(&(filter->glob_list), list))) {
 		ao2_ref(globres, -1);
 	}