diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 4ac11162..1bbd9b73 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -213,7 +213,7 @@ class IssuesController < ApplicationController
     # Optimistic locking exception
     flash.now[:error] = l(:notice_locking_conflict)
     # Remove the previously added attachments if issue was not updated
-    attachments.each(&:destroy)
+    attachments[:files].each(&:destroy) if attachments[:files]
   end
 
   def reply