diff --git a/h2/src/docsrc/html/changelog.html b/h2/src/docsrc/html/changelog.html
index 74118391ac..4ac74aed15 100644
--- a/h2/src/docsrc/html/changelog.html
+++ b/h2/src/docsrc/html/changelog.html
@@ -21,6 +21,14 @@ <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>Issue #4010: org.h2.jdbc.JdbcConnection.getTypeMap() returns null
+</li>
+<li>PR #4007: Update pom.xml related to CVE-2024-1597
+</li>
+<li>Issue #3907: MvStoreTool unable to Repair() or Rollback() [2.1.214]
+</li>
+<li>RP #3997: Server-side batch execution for prepared statements
+</li>
 <li>Issue #3106: Trailing commas in SELECT are accepted by the parser
 </li>
 <li>PR #3992: Add IPv6 support to H2 Console
diff --git a/h2/src/main/org/h2/jdbc/JdbcConnection.java b/h2/src/main/org/h2/jdbc/JdbcConnection.java
index 7bbdaeb703..fd9f7bf4fe 100644
--- a/h2/src/main/org/h2/jdbc/JdbcConnection.java
+++ b/h2/src/main/org/h2/jdbc/JdbcConnection.java
@@ -830,7 +830,7 @@ public Map<String, Class<?>> getTypeMap() throws SQLException {
         try {
             debugCodeCall("getTypeMap");
             checkClosed();
-            return null;
+            return Map.of();
         } catch (Exception e) {
             throw logAndConvert(e);
         }
@@ -1861,7 +1861,7 @@ public int getNetworkTimeout() {
      * @throws DbException if the map is not empty
      */
     static void checkMap(Map<String, Class<?>> map) {
-        if (map != null && map.size() > 0) {
+        if (map != null && !map.isEmpty()) {
             throw DbException.getUnsupportedException("map.size > 0");
         }
     }
diff --git a/h2/src/test/org/h2/test/jdbc/TestStatement.java b/h2/src/test/org/h2/test/jdbc/TestStatement.java
index 7cda83b1b4..a619f84923 100644
--- a/h2/src/test/org/h2/test/jdbc/TestStatement.java
+++ b/h2/src/test/org/h2/test/jdbc/TestStatement.java
@@ -69,6 +69,7 @@ private void testUnwrap() throws SQLException {
     }
 
     private void testUnsupportedOperations() throws Exception {
+        assertTrue(conn.getTypeMap().isEmpty());
         conn.setTypeMap(null);
         HashMap<String, Class<?>> map = new HashMap<>();
         conn.setTypeMap(map);