diff --git a/data-prepper-plugins/rds-source/src/main/java/org/opensearch/dataprepper/plugins/source/rds/datatype/mysql/handler/TemporalTypeHandler.java b/data-prepper-plugins/rds-source/src/main/java/org/opensearch/dataprepper/plugins/source/rds/datatype/mysql/handler/TemporalTypeHandler.java
index 0f7c5559f8..68a4a7c43e 100644
--- a/data-prepper-plugins/rds-source/src/main/java/org/opensearch/dataprepper/plugins/source/rds/datatype/mysql/handler/TemporalTypeHandler.java
+++ b/data-prepper-plugins/rds-source/src/main/java/org/opensearch/dataprepper/plugins/source/rds/datatype/mysql/handler/TemporalTypeHandler.java
@@ -88,7 +88,7 @@ private Long handleTime(final String timeStr) {
     private Long handleDate(final String dateStr) {
         try {
             // Handle MySQL zero date special case
-            if ("0000-00-00".equals(dateStr)) {
+            if (dateStr.matches("^0000-.*|.*-00-.*|.*-00$")) {
                 return null;
             }
 
@@ -107,6 +107,9 @@ private Long handleDate(final String dateStr) {
 
     private Long handleDateTime(final String dateTimeStr) {
         try {
+            if (dateTimeStr.startsWith("0000-00-00")) {
+                return null;
+            }
             final Long dateTimeEpoch = parseDateTimeStrAsEpochMillis(dateTimeStr);
             if (dateTimeEpoch != null) return dateTimeEpoch;
 
diff --git a/data-prepper-plugins/rds-source/src/test/java/org/opensearch/dataprepper/plugins/source/rds/datatype/mysql/handler/TemporalTypeHandlerTest.java b/data-prepper-plugins/rds-source/src/test/java/org/opensearch/dataprepper/plugins/source/rds/datatype/mysql/handler/TemporalTypeHandlerTest.java
index 848a32794a..fa52f3ea5e 100644
--- a/data-prepper-plugins/rds-source/src/test/java/org/opensearch/dataprepper/plugins/source/rds/datatype/mysql/handler/TemporalTypeHandlerTest.java
+++ b/data-prepper-plugins/rds-source/src/test/java/org/opensearch/dataprepper/plugins/source/rds/datatype/mysql/handler/TemporalTypeHandlerTest.java
@@ -60,7 +60,10 @@ private static Stream<Arguments> provideDateTestCases() {
                 Arguments.of("1970-01-01", getEpochMillisFromDate(1970, 1, 1)),
                 Arguments.of("2024-02-29", getEpochMillisFromDate(2024, 2, 29)), // Leap year
                 Arguments.of("0000-00-00", null),
-                Arguments.of("1684108800000", getEpochMillisFromDate(2023, 5, 15))
+                Arguments.of("1684108800000", getEpochMillisFromDate(2023, 5, 15),
+                Arguments.of("1997-00-01", null),
+                Arguments.of("0000-01-12", null),
+                Arguments.of("1997-01-00", null))
         );
     }
 
@@ -94,7 +97,7 @@ private static Stream<Arguments> provideTimeTestCases() {
 
     @ParameterizedTest
     @MethodSource("provideDateTimeTestCases")
-    void handle_withDateTimeType_returnsCorrectEpochMillis(String input, long expected) {
+    void handle_withDateTimeType_returnsCorrectEpochMillis(String input, Long expected) {
         Long result = temporalTypeHandler.handle(MySQLDataType.DATETIME, "datetime_column", input, null);
         assertEquals(expected, result);
     }
@@ -104,7 +107,8 @@ private static Stream<Arguments> provideDateTimeTestCases() {
             Arguments.of("2023-12-25 14:30:00.123456", getEpochMillis(2023, 12, 25, 14, 30, 0, 123456000)),
             Arguments.of("1970-01-01 00:00:00", getEpochMillis(1970, 1, 1, 0, 0, 0, 0)),
             Arguments.of("1703509900000", 1703509900000L),
-            Arguments.of("1784161123456789", 1784161123456L)
+            Arguments.of("1784161123456789", 1784161123456L),
+            Arguments.of("0000-00-00 14:30:00.123456", null)
         );
     }