diff --git a/CHANGES.txt b/CHANGES.txt
index 6c601e5a88..435b1243fb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 1.2.19
+ * Don't index tombstones (CASSANDRA-7828)
  * Don't allow compacted sstables to be marked as compacting (CASSANDRA-7145)
  * Track expired tombstones (CASSANDRA-7810)
  * Validate empty cell names from counter updates (CASSANDRA-7798)
diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
index 7fefa13ec2..8839228f27 100644
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@ -443,7 +443,7 @@ public class SecondaryIndexManager
             {
                 for (IColumn column : cf)
                 {
-                    if (index.indexes(column.name()))
+                    if (column.isLive() && index.indexes(column.name()))
                         ((PerColumnSecondaryIndex) index).insert(key, column);
                 }
             }