diff --git a/presto-main/src/main/java/com/facebook/presto/operator/Driver.java b/presto-main/src/main/java/com/facebook/presto/operator/Driver.java
index <HASH>..<HASH> 100644
--- a/presto-main/src/main/java/com/facebook/presto/operator/Driver.java
+++ b/presto-main/src/main/java/com/facebook/presto/operator/Driver.java
@@ -650,6 +650,10 @@ public class Driver
 
     private static ListenableFuture<?> firstFinishedFuture(List<ListenableFuture<?>> futures)
     {
+        if (futures.size() == 1) {
+            return futures.get(0);
+        }
+
         SettableFuture<?> result = SettableFuture.create();
 
         for (ListenableFuture<?> future : futures) {
Short circuit Driver.firstFinishedFuture with one future