diff --git a/CHANGELOG b/CHANGELOG
index 4abdd4ebb7eddce01c9fba1e17099fc63fe4fafc..05d6d6118a130a79cc439597025b3950a496a48b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -93,6 +93,7 @@ v 8.13.0 (unreleased)
   - API: all unknown routing will be handled with 404 Not Found
 
 v 8.12.5 (unreleased)
+  - Update the mail_room gem to 0.8.1 to fix a race condition with the mailbox watching thread
 
 v 8.12.4
   - Fix "Copy to clipboard" tooltip to say "Copied!" when clipboard button is clicked. !6294 (lukehowell)
diff --git a/Gemfile b/Gemfile
index 426b824901eec0bbb30f03a68b0ce9af7e0cda3d..c5f1ce26daf17e4ee7cebf5bff621c24f0eef6c4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -324,7 +324,7 @@ gem 'newrelic_rpm', '~> 3.16'
 
 gem 'octokit', '~> 4.3.0'
 
-gem 'mail_room', '~> 0.8'
+gem 'mail_room', '~> 0.8.1'
 
 gem 'email_reply_parser', '~> 0.5.8'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ccab330993aabf3c24676bcfd29fa302f62425d9..2feec4c4eb56f0b1fd25e805e886ce66b2919c3c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -889,7 +889,7 @@ DEPENDENCIES
   license_finder (~> 2.1.0)
   licensee (~> 8.0.0)
   loofah (~> 2.0.3)
-  mail_room (~> 0.8)
+  mail_room (~> 0.8.1)
   method_source (~> 0.8)
   minitest (~> 5.7.0)
   mousetrap-rails (~> 1.4.6)