1 files changed, 2 insertions, 0 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java
index 68f89572503..34510805aca 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java
@@ -60,6 +60,7 @@ public class ProxyServer implements Runnable {
         if (rpcServer != null) {
             Thread t = new Thread(rpcServer);
             t.setName("RpcServer");
+            t.setDaemon(true);
             t.start();
         }
     }
@@ -147,6 +148,7 @@ public class ProxyServer implements Runnable {
         proxyServer.setupSignalHandler();
         Thread proxyserverThread = new Thread(proxyServer);
         proxyserverThread.setName("configproxy");
+        proxyserverThread.setDaemon(true);
         proxyserverThread.start();
         proxyServer.waitForShutdown();
     }