diff --git a/config.yaml b/config.yaml
index e23faaa268..b53999d5b0 100644
--- a/config.yaml
+++ b/config.yaml
@@ -165,6 +165,7 @@ server:
     DB_URL: "jdbc:mysql://localhost:3306/cosmic"
     DB_USER: "cosmic_server"
     DB_PASS: "snailshell"
+    INIT_CONNECTION_POOL_TIMEOUT: 60    # Seconds
 
     #Login Configuration
     WORLDS: 1                           #Initial number of worlds on the server.
diff --git a/src/main/java/config/ServerConfig.java b/src/main/java/config/ServerConfig.java
index 2feeec8b4d..df37b3d8b0 100644
--- a/src/main/java/config/ServerConfig.java
+++ b/src/main/java/config/ServerConfig.java
@@ -8,6 +8,7 @@ public class ServerConfig {
     public String DB_URL;
     public String DB_USER;
     public String DB_PASS;
+    public int INIT_CONNECTION_POOL_TIMEOUT;
 
     //Login Configuration
     public int WORLDS;
diff --git a/src/main/java/tools/DatabaseConnection.java b/src/main/java/tools/DatabaseConnection.java
index 821b30bb1b..0e6df919a1 100644
--- a/src/main/java/tools/DatabaseConnection.java
+++ b/src/main/java/tools/DatabaseConnection.java
@@ -49,7 +49,7 @@ public class DatabaseConnection {
      * @return true if connection to the database initiated successfully, false if not successful
      */
     public static boolean initializeConnectionPool() {
-        final int timeoutSeconds = 60;
+        final int timeoutSeconds = YamlConfig.config.server.INIT_CONNECTION_POOL_TIMEOUT;
         final Instant timeout = Instant.now().plusSeconds(timeoutSeconds);
 
         System.out.println("Initializing connection pool...");