diff --git a/src/rx/rx.c b/src/rx/rx.c
index 5857061eb4..e3a4c6a519 100644
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -2006,7 +2006,7 @@ rx_GetCall(int tno, struct rx_service *cur_service, osi_socket * socketp)
 		}
 		MUTEX_ENTER(&rx_pthread_mutex);
 		if (tno == rxi_fcfs_thread_num
-		    || !tcall->queue_item_header.next) {
+			|| queue_IsLast(&rx_incomingCallQueue, tcall)) {
 		    MUTEX_EXIT(&rx_pthread_mutex);
 		    /* If we're the fcfs thread , then  we'll just use
 		     * this call. If we haven't been able to find an optimal