diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraSimpleTypeHolder.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraSimpleTypeHolder.java
index 1228e2e9b..c6b1120a4 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraSimpleTypeHolder.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraSimpleTypeHolder.java
@@ -17,6 +17,7 @@ package org.springframework.data.cassandra.core.mapping;
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -124,6 +125,9 @@ public class CassandraSimpleTypeHolder extends SimpleTypeHolder {
 		// override UUID to timeuuid as regular uuid as the favored default
 		classToDataType.put(UUID.class, DataTypes.UUID);
 
+		// Add type migration support for TIMESTAMP via java.util.Date to preserve driver v3 type mapping
+		classToDataType.put(Date.class, DataTypes.TIMESTAMP);
+
 		return classToDataType;
 	}