diff --git a/bindings/java/src/main/java/tech/turso/jdbc4/JDBC4PreparedStatement.java b/bindings/java/src/main/java/tech/turso/jdbc4/JDBC4PreparedStatement.java
index a9cc3350e..e3ebfc8c7 100644
--- a/bindings/java/src/main/java/tech/turso/jdbc4/JDBC4PreparedStatement.java
+++ b/bindings/java/src/main/java/tech/turso/jdbc4/JDBC4PreparedStatement.java
@@ -28,6 +28,7 @@ import tech.turso.core.LimboResultSet;
 public final class JDBC4PreparedStatement extends JDBC4Statement implements PreparedStatement {
 
   private final String sql;
+  private final JDBC4ResultSet resultSet;
 
   public JDBC4PreparedStatement(JDBC4Connection connection, String sql) throws SQLException {
     super(connection);
@@ -35,13 +36,13 @@ public final class JDBC4PreparedStatement extends JDBC4Statement implements Prep
     this.sql = sql;
     this.statement = connection.prepare(sql);
     this.statement.initializeColumnMetadata();
+    this.resultSet = new JDBC4ResultSet(this.statement.getResultSet());
   }
 
   @Override
   public ResultSet executeQuery() throws SQLException {
     // TODO: check bindings etc
-    requireNonNull(this.statement);
-    return new JDBC4ResultSet(this.statement.getResultSet());
+    return this.resultSet;
   }
 
   @Override
@@ -204,7 +205,7 @@ public final class JDBC4PreparedStatement extends JDBC4Statement implements Prep
   @Override
   @SkipNullableCheck
   public ResultSetMetaData getMetaData() throws SQLException {
-    return null;
+    return new JDBC4ResultSetMetadata(this.resultSet);
   }
 
   @Override
diff --git a/bindings/java/src/main/java/tech/turso/jdbc4/JDBC4ResultSetMetadata.java b/bindings/java/src/main/java/tech/turso/jdbc4/JDBC4ResultSetMetadata.java
index 2a44e3075..73f6a4be7 100644
--- a/bindings/java/src/main/java/tech/turso/jdbc4/JDBC4ResultSetMetadata.java
+++ b/bindings/java/src/main/java/tech/turso/jdbc4/JDBC4ResultSetMetadata.java
@@ -4,6 +4,13 @@ import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 
 public class JDBC4ResultSetMetadata implements ResultSetMetaData {
+
+    private final JDBC4ResultSet resultSet;
+
+    public JDBC4ResultSetMetadata(JDBC4ResultSet resultSet) {
+        this.resultSet = resultSet;
+    }
+
     @Override
     public int getColumnCount() throws SQLException {
         // TODO