diff --git a/src/main/java/io/confluent/connect/elasticsearch/DataConverter.java b/src/main/java/io/confluent/connect/elasticsearch/DataConverter.java
index 5eccc6096..66c40929e 100644
--- a/src/main/java/io/confluent/connect/elasticsearch/DataConverter.java
+++ b/src/main/java/io/confluent/connect/elasticsearch/DataConverter.java
@@ -295,10 +295,11 @@ Schema preProcessSchema(Schema schema) {
       switch (schemaName) {
         case Decimal.LOGICAL_NAME:
           return copySchemaBasics(schema, SchemaBuilder.float64()).build();
-        case Date.LOGICAL_NAME:
         case Time.LOGICAL_NAME:
         case Timestamp.LOGICAL_NAME:
           return schema;
+        case Date.LOGICAL_NAME:
+          return copySchemaBasics(schema, SchemaBuilder.int64()).build();
         default:
           // User type or unknown logical type
           break;
@@ -408,10 +409,11 @@ private Object preProcessLogicalValue(String schemaName, Object value) {
     switch (schemaName) {
       case Decimal.LOGICAL_NAME:
         return ((BigDecimal) value).doubleValue();
-      case Date.LOGICAL_NAME:
       case Time.LOGICAL_NAME:
       case Timestamp.LOGICAL_NAME:
         return value;
+      case Date.LOGICAL_NAME:
+        return ((java.util.Date) value).getTime();
       default:
         // User-defined type or unknown built-in
         return null;