1 files changed, 4 insertions, 2 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java b/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java
index b4a469c569a..5b5ff0770c4 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java
@@ -49,9 +49,11 @@ public class SearchResponse {
     }
 
     public static Timing createTiming(Query query, Result result) {
-        return new Timing(result.getElapsedTime().firstFill(),
+        long summaryStartTime = result.getElapsedTime().firstFill();
+        long queryStartTime = result.getElapsedTime().first();
+        return new Timing(summaryStartTime,
                           0,
-                          result.getElapsedTime().first(),
+                          queryStartTime == Long.MAX_VALUE ? 0 : queryStartTime,
                           query.getTimeout());
     }