diff --git a/app/models/email_log.rb b/app/models/email_log.rb
index 4182134767a..a75fc0764bb 100644
--- a/app/models/email_log.rb
+++ b/app/models/email_log.rb
@@ -15,7 +15,7 @@ class EmailLog < ActiveRecord::Base
   }
 
   # cf. https://www.iana.org/assignments/smtp-enhanced-status-codes/smtp-enhanced-status-codes.xhtml
-  SMTP_ERROR_CODE_REGEXP = Regexp.new(/\d\.\d\.\d|\d\d\d/).freeze
+  SMTP_ERROR_CODE_REGEXP = Regexp.new(/\d\.\d\.\d+|\d{3}/).freeze
 
   belongs_to :user
   belongs_to :post
diff --git a/db/post_migrate/20220220234155_conform_bounce_error_code.rb b/db/post_migrate/20220220234155_conform_bounce_error_code.rb
index 349073070ea..ad3d1b19904 100644
--- a/db/post_migrate/20220220234155_conform_bounce_error_code.rb
+++ b/db/post_migrate/20220220234155_conform_bounce_error_code.rb
@@ -2,7 +2,7 @@
 #
 class ConformBounceErrorCode < ActiveRecord::Migration[6.1]
   def up
-    DB.exec(<<~SQL, regexp: '\d\.\d\.\d|\d\d\d')
+    DB.exec(<<~SQL, regexp: '\d\.\d\.\d+|\d{3}')
       UPDATE email_logs
       SET bounce_error_code = (
         SELECT array_to_string(
diff --git a/spec/models/email_log_spec.rb b/spec/models/email_log_spec.rb
index be6befc16a2..cfaf5ab8d30 100644
--- a/spec/models/email_log_spec.rb
+++ b/spec/models/email_log_spec.rb
@@ -168,6 +168,8 @@ describe EmailLog do
     it "makes sure the bounce_error_code is in the format X.X.X or XXX" do
       email_log.update!(bounce_error_code: "5.1.1")
       expect(email_log.reload.bounce_error_code).to eq("5.1.1")
+      email_log.update!(bounce_error_code: "5.2.23")
+      expect(email_log.reload.bounce_error_code).to eq("5.2.23")
       email_log.update!(bounce_error_code: "5.0.0 (permanent failure)")
       expect(email_log.reload.bounce_error_code).to eq("5.0.0")
       email_log.update!(bounce_error_code: "422")