diff --git a/nostrdb/src/nostrdb.c b/nostrdb/src/nostrdb.c
index 9f3200eb..1e70592b 100644
--- a/nostrdb/src/nostrdb.c
+++ b/nostrdb/src/nostrdb.c
@@ -5614,6 +5614,20 @@ struct ndb_subscription *ndb_find_subscription(struct ndb *ndb, uint64_t subid)
 	return sub;
 }
 
+int ndb_poll_for_notes(struct ndb *ndb, uint64_t subid, uint64_t *note_ids,
+		       int note_id_capacity)
+{
+	struct ndb_subscription *sub;
+
+	if (subid == 0)
+		return 0;
+
+	if (!(sub = ndb_find_subscription(ndb, subid)))
+		return 0;
+
+	return prot_queue_try_pop_all(&sub->inbox, note_ids, note_id_capacity);
+}
+
 int ndb_wait_for_notes(struct ndb *ndb, uint64_t subid, uint64_t *note_ids,
 		       int note_id_capacity)
 {
diff --git a/nostrdb/src/nostrdb.h b/nostrdb/src/nostrdb.h
index 709d0899..0d03aa4f 100644
--- a/nostrdb/src/nostrdb.h
+++ b/nostrdb/src/nostrdb.h
@@ -486,8 +486,8 @@ void ndb_filter_destroy(struct ndb_filter *);
 
 // SUBSCRIPTIONS
 uint64_t ndb_subscribe(struct ndb *, struct ndb_filter *, int num_filters);
-int ndb_wait_for_notes(struct ndb *, uint64_t subid, uint64_t *note_ids,
-		       int note_id_capacity);
+int ndb_wait_for_notes(struct ndb *, uint64_t subid, uint64_t *note_ids, int note_id_capacity);
+int ndb_poll_for_notes(struct ndb *, uint64_t subid, uint64_t *note_ids, int note_id_capacity);
 int ndb_unsubscribe(int subid);
 
 // FULLTEXT SEARCH