diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java
index b5fe329273..91459c5eed 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java
@@ -2005,7 +2005,13 @@ private void processTimestampSeeks() {
 			if (timestampSeeks != null) {
 				Map<TopicPartition, OffsetAndTimestamp> offsetsForTimes = this.consumer
 						.offsetsForTimes(timestampSeeks);
-				offsetsForTimes.forEach((tp, ot) -> this.consumer.seek(tp, ot.offset()));
+
+				for (TopicPartition tp : offsetsForTimes.keySet()) {
+					OffsetAndTimestamp ot = offsetsForTimes.get(tp);
+					if (ot != null) {
+						this.consumer.seek(tp, ot.offset());
+					}
+				}
 			}
 		}