diff --git a/CHANGES.txt b/CHANGES.txt
index b62282a250..cdcb5ccacc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -55,6 +55,8 @@
 
 
 2.1.3
+ * Make sure we don't add tmplink files to the compaction
+   strategy (CASSANDRA-8580)
  * (cqlsh) Handle maps with blob keys (CASSANDRA-8372)
  * (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563)
  * Add tooling to detect hot partitions (CASSANDRA-7974)
diff --git a/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
index 9d83a47fc6..947ab31719 100644
--- a/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
@@ -323,10 +323,13 @@ public final class WrappingCompactionStrategy extends AbstractCompactionStrategy
         super.startup();
         for (SSTableReader sstable : cfs.getSSTables())
         {
-            if (sstable.isRepaired())
-                repaired.addSSTable(sstable);
-            else
-                unrepaired.addSSTable(sstable);
+            if (sstable.openReason != SSTableReader.OpenReason.EARLY)
+            {
+                if (sstable.isRepaired())
+                    repaired.addSSTable(sstable);
+                else
+                    unrepaired.addSSTable(sstable);
+            }
         }
         repaired.startup();
         unrepaired.startup();