1 files changed, 2 insertions, 0 deletions

diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
index 799603cf954..529afb6747d 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
@@ -135,6 +135,7 @@ public class DefaultZtsClient implements ZtsClient {
 
     private <T> T withClient(Function<CloseableHttpClient, T> consumer) {
         Lock lock = this.lock.readLock();
+        lock.lock();
         try {
             return consumer.apply(this.client);
         } finally {
@@ -144,6 +145,7 @@ public class DefaultZtsClient implements ZtsClient {
 
     private void setClient(CloseableHttpClient newClient) {
         Lock lock = this.lock.writeLock();
+        lock.lock();
         CloseableHttpClient oldClient;
         try {
             oldClient = this.client;