diff --git a/config/application.rb b/config/application.rb
index aafb3847ef2..8d1ff37a034 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -117,9 +117,9 @@ module Discourse
     # see: http://stackoverflow.com/questions/11894180/how-does-one-correctly-add-custom-sql-dml-in-migrations/11894420#11894420
     config.active_record.schema_format = :sql
 
-    if Rails.version >= "4.2.0"
+    if Rails.version >= "4.2.0" && Rails.version < "5.0.0"
       # Opt-into the default behavior in Rails 5
-      # config.active_record.raise_in_transactional_callbacks = true
+      config.active_record.raise_in_transactional_callbacks = false
     end
 
     # per https://www.owasp.org/index.php/Password_Storage_Cheat_Sheet