diff --git a/bindings/java/src/main/java/tech/turso/jdbc4/JDBC4ResultSet.java b/bindings/java/src/main/java/tech/turso/jdbc4/JDBC4ResultSet.java
index f3fefb3c3..993ae08df 100644
--- a/bindings/java/src/main/java/tech/turso/jdbc4/JDBC4ResultSet.java
+++ b/bindings/java/src/main/java/tech/turso/jdbc4/JDBC4ResultSet.java
@@ -835,15 +835,24 @@ public final class JDBC4ResultSet implements ResultSet, ResultSetMetaData {
   @Override
   @SkipNullableCheck
   public Time getTime(int columnIndex, Calendar cal) throws SQLException {
-    // TODO: Properly handle timezone conversion with Calendar
-    return getTime(columnIndex);
+    final Time time = getTime(columnIndex);
+    if (time == null || cal == null) {
+      return time;
+    }
+
+    final Calendar localCal = Calendar.getInstance();
+    localCal.setTime(time);
+
+    final long offset = cal.getTimeZone().getOffset(time.getTime()) -
+        localCal.getTimeZone().getOffset(time.getTime());
+
+    return new Time(time.getTime() + offset);
   }
 
   @Override
   @SkipNullableCheck
   public Time getTime(String columnLabel, Calendar cal) throws SQLException {
-    // TODO: Properly handle timezone conversion with Calendar
-    return getTime(columnLabel);
+    return getTime(findColumn(columnLabel), cal);
   }
 
   @Override
diff --git a/bindings/java/src/test/java/tech/turso/jdbc4/JDBC4ResultSetTest.java b/bindings/java/src/test/java/tech/turso/jdbc4/JDBC4ResultSetTest.java
index b8a51824b..746ad6181 100644
--- a/bindings/java/src/test/java/tech/turso/jdbc4/JDBC4ResultSetTest.java
+++ b/bindings/java/src/test/java/tech/turso/jdbc4/JDBC4ResultSetTest.java
@@ -7,6 +7,7 @@ import java.nio.ByteBuffer;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.sql.Time;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Properties;
@@ -766,4 +767,57 @@ class JDBC4ResultSetTest {
 
     assertNotNull(date);
   }
+
+  @Test
+  void test_getTime_with_calendar() throws Exception {
+    stmt.executeUpdate("CREATE TABLE test_time_cal (time_col BLOB);");
+
+    // 2025-10-07 03:00:00 UTC in milliseconds
+    long utcTime = 1728270000000L;
+    byte[] timeBytes = ByteBuffer.allocate(Long.BYTES).putLong(utcTime).array();
+
+    StringBuilder hexString = new StringBuilder();
+    for (byte b : timeBytes) {
+      hexString.append(String.format("%02X", b));
+    }
+    stmt.executeUpdate("INSERT INTO test_time_cal (time_col) VALUES (X'" + hexString + "');");
+
+    ResultSet resultSet = stmt.executeQuery("SELECT * FROM test_time_cal");
+    assertTrue(resultSet.next());
+
+    // Get time with UTC calendar
+    Calendar utcCal = Calendar.getInstance(java.util.TimeZone.getTimeZone("UTC"));
+    Time utcTime2 = resultSet.getTime(1, utcCal);
+
+    // Get time with Seoul calendar (UTC+9)
+    Calendar seoulCal = Calendar.getInstance(java.util.TimeZone.getTimeZone("Asia/Seoul"));
+    Time seoulTime = resultSet.getTime(1, seoulCal);
+
+    // Seoul time should be 9 hours ahead
+    long timeDiff = seoulTime.getTime() - utcTime2.getTime();
+    assertEquals(9 * 60 * 60 * 1000, timeDiff);
+  }
+
+  @Test
+  void test_getTime_with_calendar_columnLabel() throws Exception {
+    stmt.executeUpdate("CREATE TABLE test_time_cal (created_at BLOB);");
+
+    // 2025-10-07 03:00:00 UTC in milliseconds
+    long utcTime = 1728270000000L;
+    byte[] timeBytes = ByteBuffer.allocate(Long.BYTES).putLong(utcTime).array();
+
+    StringBuilder hexString = new StringBuilder();
+    for (byte b : timeBytes) {
+      hexString.append(String.format("%02X", b));
+    }
+    stmt.executeUpdate("INSERT INTO test_time_cal (created_at) VALUES (X'" + hexString + "');");
+
+    ResultSet resultSet = stmt.executeQuery("SELECT * FROM test_time_cal");
+    assertTrue(resultSet.next());
+
+    Calendar utcCal = Calendar.getInstance(java.util.TimeZone.getTimeZone("UTC"));
+    Time time = resultSet.getTime("created_at", utcCal);
+
+    assertNotNull(time);
+  }
 }