diff --git a/git_cl.py b/git_cl.py
index 1a817c5229..3d4f476c15 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -3043,7 +3043,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     if options.send_mail:
       refspec_opts.append('ready')
       refspec_opts.append('notify=ALL')
-    elif not self.GetIssue():
+    elif not self.GetIssue() and options.squash:
       refspec_opts.append('wip')
     else:
       refspec_opts.append('notify=NONE')
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index 263a455aeb..58ec847e6a 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -1283,7 +1283,7 @@ class TestGitCl(TestCase):
     if notify:
       ref_suffix = '%ready,notify=ALL'
     else:
-      if not issue:
+      if not issue and squash:
         ref_suffix = '%wip'
       else:
         ref_suffix = '%notify=NONE'