diff --git a/ruby/lib/ci/queue/redis/supervisor.rb b/ruby/lib/ci/queue/redis/supervisor.rb
index 23ca4042..a473e60c 100644
--- a/ruby/lib/ci/queue/redis/supervisor.rb
+++ b/ruby/lib/ci/queue/redis/supervisor.rb
@@ -39,7 +39,9 @@ def wait_for_workers
             yield if block_given?
           end
 
-          puts "Aborting, it seems all workers died." if time_left_with_no_workers <= 0
+          puts "Aborting, timed out." if time_left <= 0 && !exhausted?
+          puts "Aborting, it seems all workers died." if time_left_with_no_workers <= 0 && !exhausted?
+
           exhausted?
         rescue CI::Queue::Redis::LostMaster
           false