diff --git a/spa/include/spa/utils/hook.h b/spa/include/spa/utils/hook.h
index 7685631af..32421248f 100644
--- a/spa/include/spa/utils/hook.h
+++ b/spa/include/spa/utils/hook.h
@@ -94,6 +94,19 @@ static inline void spa_hook_remove(struct spa_hook *hook)
 	}									\
 })
 
+#define spa_hook_list_call_simple_safe(l,type,method,vers,...)			\
+({										\
+	struct spa_hook_list *list = l;						\
+	struct spa_hook *ci;							\
+	struct spa_hook *tmp;							\
+	spa_list_for_each_safe(ci, tmp, &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 */
diff --git a/src/pipewire/private.h b/src/pipewire/private.h
index 1bb314e7c..a4f062f70 100644
--- a/src/pipewire/private.h
+++ b/src/pipewire/private.h
@@ -303,7 +303,7 @@ struct pw_module {
 	void *user_data;                /**< module user_data */
 };
 
-#define pw_node_events_emit(o,m,v,...) spa_hook_list_call(&o->listener_list, struct pw_node_events, m, v, ##__VA_ARGS__)
+#define pw_node_events_emit(o,m,v,...) spa_hook_list_call_simple_safe(&o->listener_list, struct pw_node_events, m, v, ##__VA_ARGS__)
 #define pw_node_events_destroy(n)		pw_node_events_emit(n, destroy, 0)
 #define pw_node_events_free(n)			pw_node_events_emit(n, free, 0)
 #define pw_node_events_initialized(n)		pw_node_events_emit(n, initialized, 0)