diff --git a/spa/include/spa/support/loop.h b/spa/include/spa/support/loop.h
index b24479e28..f1d0be188 100644
--- a/spa/include/spa/support/loop.h
+++ b/spa/include/spa/support/loop.h
@@ -104,8 +104,8 @@ struct spa_loop_control_hooks {
 	void (*after) (void *data);
 };
 
-#define spa_loop_control_hook_before(l) spa_hook_list_call(l, struct spa_loop_control_hooks, before, 0)
-#define spa_loop_control_hook_after(l) spa_hook_list_call(l, struct spa_loop_control_hooks, after, 0)
+#define spa_loop_control_hook_before(l) spa_hook_list_call_simple(l, struct spa_loop_control_hooks, before, 0)
+#define spa_loop_control_hook_after(l) spa_hook_list_call_simple(l, struct spa_loop_control_hooks, after, 0)
 
 /**
  * Control an event loop
diff --git a/spa/include/spa/utils/hook.h b/spa/include/spa/utils/hook.h
index bde20dc27..dd04af9af 100644
--- a/spa/include/spa/utils/hook.h
+++ b/spa/include/spa/utils/hook.h
@@ -82,6 +82,18 @@ static inline void spa_hook_remove(struct spa_hook *hook)
 		hook->removed(hook);
 }
 
+#define spa_hook_list_call_simple(l,type,method,vers,...)			\
+({										\
+	struct spa_hook_list *list = l;						\
+	struct spa_hook *ci;							\
+	spa_list_for_each(ci, &list->list, link) {				\
+		const type *cb = ci->funcs;					\
+		if (cb && cb->version >= vers && cb->method) {			\
+			cb->method(ci->data, ## __VA_ARGS__);			\
+		}								\
+	}									\
+})
+
 /** Call all hooks in a list, starting from the given one and optionally stopping
  * after calling the first non-NULL function, returns the number of methods
  * called */