diff --git a/hikaricp-common/src/main/java/com/zaxxer/hikari/pool/BaseHikariPool.java b/hikaricp-common/src/main/java/com/zaxxer/hikari/pool/BaseHikariPool.java
index 2d5985be..42c741b9 100644
--- a/hikaricp-common/src/main/java/com/zaxxer/hikari/pool/BaseHikariPool.java
+++ b/hikaricp-common/src/main/java/com/zaxxer/hikari/pool/BaseHikariPool.java
@@ -241,8 +241,9 @@ public abstract class BaseHikariPool implements HikariPoolMBean, IBagStateListen
          logPoolState("Before shutdown ");
          connectionBag.close();
          softEvictConnections();
-         houseKeepingExecutorService.shutdownNow();
+         houseKeepingExecutorService.shutdown();
          addConnectionExecutor.shutdown();
+         houseKeepingExecutorService.awaitTermination(5L, TimeUnit.SECONDS);
          addConnectionExecutor.awaitTermination(5L, TimeUnit.SECONDS);
 
          final long start = System.currentTimeMillis();