diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 111ec2cca..ecf6fe049 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -203,12 +203,7 @@ class AttachmentsController < ApplicationController
     if @attachment.container.respond_to?(:init_journal)
       @attachment.container.init_journal(User.current)
     end
-    if @attachment.container
-      # Make sure association callbacks are called
-      @attachment.container.attachments.delete(@attachment)
-    else
-      @attachment.destroy
-    end
+    @attachment.destroy
 
     respond_to do |format|
       if !@attachment.container.nil? &&