diff --git a/src/main/java/org/apache/ibatis/mapping/VendorDatabaseIdProvider.java b/src/main/java/org/apache/ibatis/mapping/VendorDatabaseIdProvider.java
index 41a5dcd8baa..8f307e1cae8 100644
--- a/src/main/java/org/apache/ibatis/mapping/VendorDatabaseIdProvider.java
+++ b/src/main/java/org/apache/ibatis/mapping/VendorDatabaseIdProvider.java
@@ -57,7 +57,7 @@ private String getDatabaseName(DataSource dataSource) throws SQLException {
     String productName = getDatabaseProductName(dataSource);
     if (this.properties != null) {
       return properties.entrySet().stream().filter(entry -> productName.contains((String) entry.getKey()))
-          .map(entry -> (String) entry.getValue()).findFirst().orElse(null);
+          .map(entry -> (String) entry.getValue()).findFirst().orElse(productName);
     }
     return productName;
   }