diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 9d5b3cc5a..9853b4dc1 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -120,7 +120,7 @@ class AttachmentsController < ApplicationController
     if params[:action] == "download_history"
       UserActions.create(:action_id => id, :action_type => "AttachmentHistory", :user_id => User.current.id) unless id.nil?
     elsif params[:action] == "download"
-      UserActions.create(:action_id => id, :action_type => "Attachment", :user_id => User.current.id)
+      UserActions.create(:action_id => id, :action_type => "Attachment", :user_id => User.current.id) unless id.nil?
     end
   end