diff --git a/src/shared/queue.c b/src/shared/queue.c
index 5ddb832..60df111 100644
--- a/src/shared/queue.c
+++ b/src/shared/queue.c
@@ -280,9 +280,12 @@ void *queue_remove_if(struct queue *queue, queue_match_func_t function,
 {
 	struct queue_entry *entry, *prev = NULL;
 
-	if (!queue || !function)
+	if (!queue)
 		return NULL;
 
+	if (!function)
+		function = direct_match;
+
 	entry = queue->head;
 
 	while (entry) {