diff --git a/ocaml/xapi/xapi_event.ml b/ocaml/xapi/xapi_event.ml
index 2efc7740a5..27b667f904 100644
--- a/ocaml/xapi/xapi_event.ml
+++ b/ocaml/xapi/xapi_event.ml
@@ -324,15 +324,14 @@ let from ~__context ~classes ~token ~timeout =
 		objs
 	in
 
-	let all_subs = Mutex.execute sub.m (fun () -> Hashtbl.fold (fun _ s acc -> s.subs @ acc) subscriptions []) in
-	let tables = List.filter (fun table -> table_matches all_subs table) all_event_tables in
+	let tables = List.filter (fun table -> table_matches sub.subs table) all_event_tables in
 
 	let events_lost = ref [] in
 
 	let grab_range t =
 		let tableset = Db_cache_types.Database.tableset (Db_ref.get_database t) in
 		let (msg_gen,messages) =
-			if table_matches all_subs "message" then (!message_get_since_for_events) ~__context sub.last_msg_gen else (0L, []) in
+			if table_matches sub.subs "message" then (!message_get_since_for_events) ~__context sub.last_msg_gen else (0L, []) in
 		(msg_gen, messages, tableset, List.fold_left
 			(fun acc table ->
 				 Db_cache_types.Table.fold_over_recent sub.last_generation