diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
index 5e697029d..41d4d298c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
@@ -10,6 +10,7 @@ import java.sql.Timestamp;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.format.DateTimeParseException;
 
 /**
  * ScalarType for java.sql.Timestamp.
@@ -62,7 +63,11 @@ final class ScalarTypeLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTime
 
   @Override
   public LocalDateTime parse(String value) {
-    return LocalDateTime.parse(value);
+    try {
+      return LocalDateTime.parse(value);
+    } catch (DateTimeParseException pe) {
+      return super.parse(value);
+    }
   }
 
   @Override
diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
index 623402fb7..b4799a725 100644
--- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
+++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
@@ -123,4 +123,15 @@ public class ScalarTypeLocalDateTimeTest {
     LocalDateTime value = typeIso.fromJsonISO8601(asJson);
     assertThat(localDateTime).isEqualToIgnoringNanos(value);
   }
+  
+  @Test
+  public void testParseEbean11() {
+
+    ScalarTypeLocalDateTime typeDefault = new ScalarTypeLocalDateTime(JsonConfig.DateTime.ISO8601);
+
+    LocalDateTime fromMillis = typeDefault.parse("1517627106000");
+    LocalDateTime fromIso= typeDefault.parse("2018-02-03T04:05:06");
+    
+    assertThat(fromMillis).isEqualToIgnoringNanos(fromIso);
+  }
 }