diff --git a/lib/paperclip.rb b/lib/paperclip.rb
index cf2e5e0..947c832 100644
--- a/lib/paperclip.rb
+++ b/lib/paperclip.rb
@@ -220,7 +220,7 @@ module Paperclip
       attachment_definitions[name] = Attachment.build_class(name, options)
       const_set("#{name}_attachment".camelize, attachment_definitions[name])
 
-      after_save :save_attached_files
+      after_commit :save_attached_files
       after_commit :destroy_attached_files, on: :destroy
       after_commit :flush_attachment_jobs