diff --git a/mtapi_c/src/embb_mtapi_priority_queue_t.c b/mtapi_c/src/embb_mtapi_priority_queue_t.c
index 0e974a7..e731c71 100644
--- a/mtapi_c/src/embb_mtapi_priority_queue_t.c
+++ b/mtapi_c/src/embb_mtapi_priority_queue_t.c
@@ -160,7 +160,8 @@ embb_mtapi_task_t * embb_mtapi_priority_queue_pop(embb_mtapi_priority_queue_t* t
         }
 
         /* abort if heap property is restored. */
-        if(embb_time_compare(&deadline, &swap_deadline) <= 0) {
+        if(swap_deadline.seconds == ULLONG_MAX ||
+           embb_time_compare(&deadline, &swap_deadline) <= 0) {
           break;
         }