diff --git a/donkey/src/main/java/com/mirth/connect/donkey/server/data/jdbc/HikariConnectionPool.java b/donkey/src/main/java/com/mirth/connect/donkey/server/data/jdbc/HikariConnectionPool.java
index 54bc41ad6..ed6848acc 100644
--- a/donkey/src/main/java/com/mirth/connect/donkey/server/data/jdbc/HikariConnectionPool.java
+++ b/donkey/src/main/java/com/mirth/connect/donkey/server/data/jdbc/HikariConnectionPool.java
@@ -28,7 +28,7 @@ public HikariConnectionPool(String driver, String url, String username, String p
         dataSource.setJdbcUrl(url);
         dataSource.setUsername(username);
         dataSource.setPassword(password);
-        dataSource.setConnectionTimeout(0);
+        dataSource.setConnectionTimeout(30000);
         dataSource.setAutoCommit(false);
         dataSource.setMaximumPoolSize(maxConnections);
         dataSource.setMinimumIdle(0);