diff --git a/git_cl.py b/git_cl.py
index 5266b5fe9..7ccf8e096 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -3102,7 +3102,8 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       print('Adding self-LGTM (Code-Review +1) because of TBRs.')
       gerrit_util.SetReview(
           self._GetGerritHost(), self.GetIssue(),
-          labels={'Code-Review': 1}, notify=bool(options.send_mail))
+          labels={'Code-Review': 1},
+          notify='ALL' if options.send_mail else 'NONE')
 
     return 0
 
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index afb4dcd20..b7b4804fa 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -1581,7 +1581,8 @@ class TestGitCl(TestCase):
     if tbr:
       calls += [
         (('SetReview', 'chromium-review.googlesource.com',
-          123456 if squash else None, {'Code-Review': 1}, notify), ''),
+          123456 if squash else None, {'Code-Review': 1},
+          'ALL' if notify else 'NONE'), ''),
       ]
     calls += cls._git_post_upload_calls()
     return calls