diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 75195bbc8adc9..78fca2f324e8c 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Encrypted attributes will now be filtered by exact matches by FilterParameters.
+
+    *Keshav Biswa*
+
 *   Raise an `ActiveRecord::ActiveRecordError` error when the MySQL database returns an invalid version string.
 
     *Kevin McPhillips*
diff --git a/activerecord/lib/active_record/encryption/auto_filtered_parameters.rb b/activerecord/lib/active_record/encryption/auto_filtered_parameters.rb
index 313c8f3ef68d3..0081d87817998 100644
--- a/activerecord/lib/active_record/encryption/auto_filtered_parameters.rb
+++ b/activerecord/lib/active_record/encryption/auto_filtered_parameters.rb
@@ -54,7 +54,7 @@ def apply_filter(klass, attribute)
           filter = [("#{klass.model_name.element}" if klass.name), attribute.to_s].compact.join(".")
           unless excluded_from_filter_parameters?(filter)
             app.config.filter_parameters << filter unless app.config.filter_parameters.include?(filter)
-            klass.filter_attributes += [ attribute ]
+            klass.filter_attributes += [ /^#{attribute}$/ ]
           end
         end