diff --git a/src/java/org/apache/cassandra/db/compaction/Scrubber.java b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
index 1e52796f9c..867c23bc34 100644
--- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java
+++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
@@ -200,7 +200,8 @@ public class Scrubber implements Closeable
                 try
                 {
                     ByteBuffer raw = ByteBufferUtil.readWithShortLength(dataFile);
-                    cfs.metadata.getLocal().partitionKeyType.validate(raw);
+                    if (!cfs.metadata.getLocal().isIndex())
+                        cfs.metadata.getLocal().partitionKeyType.validate(raw);
                     key = sstable.decorateKey(raw);
                 }
                 catch (Throwable th)
@@ -260,7 +261,8 @@ public class Scrubber implements Closeable
                         key = sstable.decorateKey(currentIndexKey);
                         try
                         {
-                            cfs.metadata.getLocal().partitionKeyType.validate(key.getKey());
+                            if (!cfs.metadata.getLocal().isIndex())
+                                cfs.metadata.getLocal().partitionKeyType.validate(key.getKey());
                             dataFile.seek(dataStartFromIndex);
 
                             if (tryAppend(prevKey, key, writer))