diff --git a/git_cl.py b/git_cl.py
index 93e21989d4..4513d95599 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1662,10 +1662,7 @@ class Changelist(object):
     print_stats(git_diff_args)
     ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
     if not ret:
-      if self.IsGerrit():
-        self.SetLabels(options.enable_auto_submit, options.use_commit_queue,
-                       options.cq_dry_run);
-      else:
+      if not self.IsGerrit():
         if options.use_commit_queue:
           self.SetCQState(_CQState.COMMIT)
         elif options.cq_dry_run:
@@ -3284,6 +3281,8 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
           msg='Self-approving for TBR',
           labels={'Code-Review': score})
 
+    self.SetLabels(options.enable_auto_submit, options.use_commit_queue,
+                   options.cq_dry_run)
     return 0
 
   def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,