diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb
index 75fb96efa..9dbe38e17 100644
--- a/app/services/staff_action_logger.rb
+++ b/app/services/staff_action_logger.rb
@@ -144,6 +144,8 @@ class StaffActionLogger
   end
 
   def log_show_emails(users)
+    return if users.blank?
+
     values = []
 
     users.each do |user|
diff --git a/spec/services/staff_action_logger_spec.rb b/spec/services/staff_action_logger_spec.rb
index be3152361..83bbae7e4 100644
--- a/spec/services/staff_action_logger_spec.rb
+++ b/spec/services/staff_action_logger_spec.rb
@@ -33,6 +33,20 @@ describe StaffActionLogger do
     end
   end
 
+  describe "log_show_emails" do
+    it "logs the user history" do
+      -> { logger.log_show_emails([admin]) }.should change(UserHistory, :count).by(1)
+    end
+
+    it "doesn't raise an exception with nothing to log" do
+      -> { logger.log_show_emails([]) }.should_not raise_error
+    end
+
+    it "doesn't raise an exception with nil input" do
+      -> { logger.log_show_emails(nil) }.should_not raise_error
+    end
+  end
+
   describe 'log_post_deletion' do
     let(:deleted_post) { Fabricate(:post) }