1 files changed, 1 insertions, 3 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
index dfd81341e5d..095bde76c39 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
@@ -182,9 +182,6 @@ class RpcConfigSourceClient implements ConfigSourceClient, Runnable {
         shutdownSourceConnections();
         delayedResponsesFuture.cancel(true);
         delayedResponsesScheduler.shutdownNow();
-        nextConfigFuture.cancel(true);
-        nextConfigScheduler.shutdownNow();
-        requester.close();
         supervisor.transport().shutdown().join();
     }
 
@@ -195,6 +192,7 @@ class RpcConfigSourceClient implements ConfigSourceClient, Runnable {
     public void shutdownSourceConnections() {
         activeSubscribers.values().forEach(Subscriber::cancel);
         activeSubscribers.clear();
+        nextConfigFuture.cancel(true);
         nextConfigScheduler.shutdownNow();
         requester.close();
     }