diff --git a/src/main/java/stirling/software/SPDF/config/security/database/DatabaseService.java b/src/main/java/stirling/software/SPDF/config/security/database/DatabaseService.java
index 04b470f92..b04ec37a8 100644
--- a/src/main/java/stirling/software/SPDF/config/security/database/DatabaseService.java
+++ b/src/main/java/stirling/software/SPDF/config/security/database/DatabaseService.java
@@ -246,15 +246,16 @@ public class DatabaseService implements DatabaseInterface {
         boolean isDBUrlH2 =
                 datasource.getCustomDatabaseUrl().contains("h2")
                         || datasource.getCustomDatabaseUrl().contains("H2");
+        boolean isCustomDatabase = datasource.isEnableCustomDatabase();
 
-        if (isTypeH2 && !isDBUrlH2) {
+        if (isTypeH2 && !isDBUrlH2 && isCustomDatabase) {
             log.warn(
                     "Datasource type is H2, but the URL does not contain 'h2'. "
                             + "Please check your configuration.");
             throw new IllegalStateException(
                     "Datasource type is H2, but the URL does not contain 'h2'. Please check your"
                             + " configuration.");
-        } else if (!isTypeH2 && isDBUrlH2) {
+        } else if (!isTypeH2 && isDBUrlH2 && isCustomDatabase) {
             log.warn(
                     "Datasource URL contains 'h2', but the type is not H2. "
                             + "Please check your configuration.");
@@ -265,7 +266,7 @@ public class DatabaseService implements DatabaseInterface {
 
         boolean isH2 = isTypeH2 && isDBUrlH2;
 
-        return !datasource.isEnableCustomDatabase() || isH2;
+        return !isCustomDatabase || isH2;
     }
 
     /**