diff --git a/src/main/java/org/springframework/data/convert/Jsr310Converters.java b/src/main/java/org/springframework/data/convert/Jsr310Converters.java
index 5e4f1afe64..97f8ff2582 100644
--- a/src/main/java/org/springframework/data/convert/Jsr310Converters.java
+++ b/src/main/java/org/springframework/data/convert/Jsr310Converters.java
@@ -126,7 +126,7 @@ public enum DateToLocalDateConverter implements Converter<Date, LocalDate> {
 		@NonNull
 		@Override
 		public LocalDate convert(Date source) {
-			return ofInstant(ofEpochMilli(source.getTime()), systemDefault()).toLocalDate();
+			return source.toInstant().atZone(ZoneOffset.UTC).toLocalDate();
 		}
 	}
 
@@ -138,7 +138,7 @@ public enum LocalDateToDateConverter implements Converter<LocalDate, Date> {
 		@NonNull
 		@Override
 		public Date convert(LocalDate source) {
-			return Date.from(source.atStartOfDay(systemDefault()).toInstant());
+			return new Date(source.atStartOfDay().atZone(ZoneOffset.UTC).toInstant().toEpochMilli());
 		}
 	}