1 files changed, 3 insertions, 2 deletions
diff --git a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java
index 4adfe3ebe1d..27904b5369c 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java
@@ -80,10 +80,12 @@ public final class VespaFeedHandler extends VespaFeedHandlerBase {
 
             MessagePropertyProcessor.PropertySetter properties = getPropertyProcessor().buildPropertySetter(request);
 
+            long millis = getTimeoutMillis(request);
+
             String route = properties.getRoute().toString();
             FeedResponse response = new FeedResponse(new RouteMetricSet(route, callback));
 
-            SingleSender sender = new SingleSender(response, getSharedSender(route), !asynchronous);
+            SingleSender sender = new SingleSender(response, getSharedSender(route), millis, !asynchronous);
             sender.addMessageProcessor(properties);
             sender.addMessageProcessor(new DocprocMessageProcessor(getDocprocChain(request), getDocprocServiceRegistry(request)));
             ThreadedFeedAccess feedAccess = new ThreadedFeedAccess(numThreads, sender);
@@ -106,7 +108,6 @@ public final class VespaFeedHandler extends VespaFeedHandlerBase {
             if (asynchronous) {
                 return response;
             }
-            long millis = getTimeoutMillis(request);
             boolean completed = sender.waitForPending(millis);
             if (!completed) {
                 response.addError(Error.TIMEOUT, "Timed out after " + millis + " ms waiting for responses");