diff --git a/src/main/java/org/cloudfoundry/security/FileWatchingX509ExtendedKeyManager.java b/src/main/java/org/cloudfoundry/security/FileWatchingX509ExtendedKeyManager.java
index b931975..f05ff1d 100644
--- a/src/main/java/org/cloudfoundry/security/FileWatchingX509ExtendedKeyManager.java
+++ b/src/main/java/org/cloudfoundry/security/FileWatchingX509ExtendedKeyManager.java
@@ -136,12 +136,14 @@ private final class FileWatcherCallback implements Runnable {
 
         @Override
         public void run() {
-            if (FileWatchingX509ExtendedKeyManager.this.keyManager.getAndSet(getKeyManager(getKeyStore())) == null) {
-                FileWatchingX509ExtendedKeyManager.this.logger.info(String.format("Initialized KeyManager for %s and %s", FileWatchingX509ExtendedKeyManager.this.privateKey,
-                    FileWatchingX509ExtendedKeyManager.this.certificates));
-            } else {
-                FileWatchingX509ExtendedKeyManager.this.logger.info(String.format("Updated KeyManager for %s and %s", FileWatchingX509ExtendedKeyManager.this.privateKey,
-                    FileWatchingX509ExtendedKeyManager.this.certificates));
+            synchronized (FileWatchingX509ExtendedKeyManager.this.keyManager) {
+                if (FileWatchingX509ExtendedKeyManager.this.keyManager.getAndSet(getKeyManager(getKeyStore())) == null) {
+                    FileWatchingX509ExtendedKeyManager.this.logger.info(String.format("Initialized KeyManager for %s and %s", FileWatchingX509ExtendedKeyManager.this.privateKey,
+                        FileWatchingX509ExtendedKeyManager.this.certificates));
+                } else {
+                    FileWatchingX509ExtendedKeyManager.this.logger.info(String.format("Updated KeyManager for %s and %s", FileWatchingX509ExtendedKeyManager.this.privateKey,
+                        FileWatchingX509ExtendedKeyManager.this.certificates));
+                }
             }
         }