diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 6193c33593dae..e7f6981da93fd 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Add common secret names to filter parameters defaults.
+
+    *Xavier Shay*
+
 *   Rename `railties/bin` to `railties/exe` to match the new Bundler executables convention.
 
     *Islam Wazery*
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index dc3ec4274bab4..e4d80604b0d77 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -23,7 +23,7 @@ def initialize(*)
         self.encoding = "utf-8"
         @allow_concurrency             = nil
         @consider_all_requests_local   = false
-        @filter_parameters             = []
+        @filter_parameters             = [:session, :secret, :salt, :cookie, :csrf]
         @filter_redirect               = []
         @helpers_paths                 = []
         @serve_static_files            = true
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 8f5b2d0d68e6c..16c814f86dbfc 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -241,7 +241,11 @@ def change
 
       require "#{app_path}/config/environment"
 
-      assert_equal [:password, :foo, 'bar'], Rails.application.env_config['action_dispatch.parameter_filter']
+      filters = Rails.application.env_config['action_dispatch.parameter_filter']
+
+      assert_includes filters, :password
+      assert_includes filters, :foo
+      assert_includes filters, 'bar'
     end
 
     test "config.to_prepare is forwarded to ActionDispatch" do