diff --git a/sdk/spring/azure-spring-boot-starter-keyvault-secrets/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-keyvault-secrets/CHANGELOG.md
index 96060dbab4087..f1016077152e2 100644
--- a/sdk/spring/azure-spring-boot-starter-keyvault-secrets/CHANGELOG.md
+++ b/sdk/spring/azure-spring-boot-starter-keyvault-secrets/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Release History
 
 ## 3.4.0-beta.1 (Unreleased)
-
+### Key Bug Fixes
+- Fix bug of Keyvault refresh Timer task blocking application termination.
 
 ## 3.3.0 (2021-03-22)
 ### New Features
diff --git a/sdk/spring/azure-spring-boot/CHANGELOG.md b/sdk/spring/azure-spring-boot/CHANGELOG.md
index 2ee14cd26f0c2..e6441ed546f74 100644
--- a/sdk/spring/azure-spring-boot/CHANGELOG.md
+++ b/sdk/spring/azure-spring-boot/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Release History
 
 ## 3.4.0-beta.1 (Unreleased)
-
+### Key Bug Fixes
+- Fix bug of Keyvault refresh Timer task blocking application termination.
 
 ## 3.3.0 (2021-03-22)
 ### New Features
diff --git a/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/keyvault/KeyVaultOperation.java b/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/keyvault/KeyVaultOperation.java
index ad602ba001105..1011a5645c613 100644
--- a/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/keyvault/KeyVaultOperation.java
+++ b/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/keyvault/KeyVaultOperation.java
@@ -89,7 +89,7 @@ public KeyVaultOperation(
                         LOG.error("Error of terminating Timer", runtimeException);
                     }
                 }
-                timer = new Timer();
+                timer = new Timer(true);
                 final TimerTask task = new TimerTask() {
                     @Override
                     public void run() {