diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index e6944a9e9..f5a0b1a12 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -445,6 +445,9 @@ public final class InternalConfiguration {
    */
   private DataTimeZone initDataTimeZone() {
     String tz = config.getDataTimeZone();
+    if ("NoTimeZone".equals(tz)) {
+      return new NoDataTimeZone();
+    }
     if (tz == null) {
       if (isMySql(getPlatform())) {
         return new MySqlDataTimeZone();