diff --git a/src/sbbs3/js_internal.c b/src/sbbs3/js_internal.c
index eee4121fc10bade24d835c70198026004f6abeaa..9dc3436c7a62ad2c896e9fc9c80c02d3df47fc39 100644
--- a/src/sbbs3/js_internal.c
+++ b/src/sbbs3/js_internal.c
@@ -1134,7 +1134,7 @@ js_handle_events(JSContext *cx, js_callback_t *cb, volatile int *terminated)
 	if (!cb->events_supported)
 		return JS_FALSE;
 
-	while (cb->keepGoing && !JS_IsExceptionPending(cx) && cb->events && !*terminated) {
+	while (cb->keepGoing && !JS_IsExceptionPending(cx) && (cb->events || cb->rq_head) && !*terminated) {
 		timeout = -1;	// Infinity by default...
 		now = (uint64_t)(xp_timer() * 1000);
 		ev = NULL;
@@ -1147,7 +1147,7 @@ js_handle_events(JSContext *cx, js_callback_t *cb, volatile int *terminated)
 #else
 		hsock = 0;
 #endif
-		
+
 #ifdef PREFER_POLL
 		for (ev = *head; ev; ev = ev->next) {
 			if (ev->type == JS_EVENT_SOCKET_READABLE || ev->type == JS_EVENT_SOCKET_READABLE_ONCE