diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgDatabaseMetaData.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgDatabaseMetaData.java
index 82a7d87193..c5431972e6 100644
--- a/pgjdbc/src/main/java/org/postgresql/jdbc/PgDatabaseMetaData.java
+++ b/pgjdbc/src/main/java/org/postgresql/jdbc/PgDatabaseMetaData.java
@@ -73,6 +73,7 @@ protected int getMaxIndexKeys() throws SQLException {
       ResultSet rs = stmt.executeQuery(sql);
       if (!rs.next()) {
         stmt.close();
+        rs.close();
         throw new PSQLException(
             GT.tr(
                 "Unable to determine a value for MaxIndexKeys due to missing system catalog data."),
diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSetMetaData.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSetMetaData.java
index e01df52ef8..6b8adbc21e 100644
--- a/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSetMetaData.java
+++ b/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSetMetaData.java
@@ -284,6 +284,7 @@ private void fetchFieldMetaData() throws SQLException {
       }
     }
     stmt.close();
+    rs.close();
     // put in cache
     _cache.setCache(idFields, fields);
   }