diff --git a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index ab3171200f..46464eca57 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java @@ -1340,8 +1340,8 @@ public abstract class SSTableReader extends SSTable implements UnfilteredSource, public boolean mayHaveTombstones() { // A sstable is guaranteed to have no tombstones if minLocalDeletionTime is still set to its default, - // Cell.NO_DELETION_TIME, which is bigger than any valid deletion times. - return getMinLocalDeletionTime() != Cell.NO_DELETION_TIME; + // Cell.NO_DELETION_TIME, which is bigger than any valid deletion times, or bigger than current time (for ttl only tombstones). + return getMinLocalDeletionTime() != Cell.NO_DELETION_TIME && getMinLocalDeletionTime() < System.currentTimeMillis()/1000; } public int getMinTTL()