diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTime.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
index 92cf21014..65bf28303 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
@@ -6,7 +6,6 @@ import java.sql.Timestamp;
 import java.sql.Types;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.time.ZonedDateTime;
 
 /**
  * ScalarType for java.sql.Timestamp.
@@ -24,7 +23,7 @@ public class ScalarTypeLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTim
 
   @Override
   public long convertToMillis(LocalDateTime value) {
-    return value.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+    return Timestamp.valueOf(value).getTime();
   }
 
   @Override
@@ -33,20 +32,18 @@ public class ScalarTypeLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTim
   }
 
   @Override
-  protected String toJsonISO8601(LocalDateTime value) {
-    return value.atZone(ZoneId.systemDefault()).toInstant().toString();
+  protected String toJsonISO8601(LocalDateTime dateTime) {
+    return dateTime.atZone(ZoneId.systemDefault()).toInstant().toString();
   }
 
   @Override
-  public LocalDateTime convertFromTimestamp(Timestamp ts) {
-    return ts.toLocalDateTime();
+  public LocalDateTime convertFromTimestamp(Timestamp timestamp) {
+    return timestamp.toLocalDateTime();
   }
 
   @Override
-  public Timestamp convertToTimestamp(LocalDateTime t) {
-
-    ZonedDateTime zonedDateTime = t.atZone(ZoneId.systemDefault());
-    return Timestamp.from(zonedDateTime.toInstant());
+  public Timestamp convertToTimestamp(LocalDateTime dateTime) {
+    return Timestamp.valueOf(dateTime);
   }
 
   @Override
diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
index 33ab414cb..3e6c8bf9d 100644
--- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
+++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
@@ -16,16 +16,25 @@ public class ScalarTypeLocalDateTimeTest {
   LocalDateTime warmUp = LocalDateTime.now();
 
   @Test
-  public void testConvertToMillis() throws Exception {
+  public void testNowToMillis() throws Exception {
 
     warmUp.hashCode();
 
     long now = System.currentTimeMillis();
     long toMillis = type.convertToMillis(LocalDateTime.now());
-
     assertTrue(toMillis - now < 30);
   }
 
+  @Test
+  public void testConvertToMillis() throws Exception {
+
+    LocalDateTime now = LocalDateTime.now();
+    long asMillis = type.convertToMillis(now);
+    LocalDateTime fromMillis = type.convertFromMillis(asMillis);
+
+    assertEquals(now, fromMillis);
+  }
+
   @Test
   public void testConvertFromTimestamp() throws Exception {