diff --git a/CHANGES.txt b/CHANGES.txt
index 60e5cdc9b9..bc3f2c6860 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 1.2.9
+ * Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900)
  * migrate 1.1 schema_columnfamilies.key_alias column to key_aliases
    (CASSANDRA-5800)
  * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831)
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index 8efa4f1337..06b17398cd 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@ -593,6 +593,8 @@ public class SSTableReader extends SSTable
 
     public long getBloomFilterSerializedSize()
     {
+        if (bf instanceof AlwaysPresentFilter)
+            return 0;
         return FilterFactory.serializedSize(bf, descriptor.version.filterType);
     }