diff --git a/src/workflow/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php
index 14c5222f..28f4bdd9 100644
--- a/src/workflow/ArcanistDiffWorkflow.php
+++ b/src/workflow/ArcanistDiffWorkflow.php
@@ -1339,13 +1339,18 @@ EOTEXT
         $template_is_default = true;
       }
 
-      $template = $conduit->callMethodSynchronous(
-        'differential.getcommitmessage',
-        array(
-          'revision_id' => null,
-          'edit'        => 'create',
-          'fields'      => $fields,
-        ));
+      if ($notes) {
+        $commit = head($this->getRepositoryAPI()->getLocalCommitInformation());
+        $template = $commit['message'];
+      } else {
+        $template = $conduit->callMethodSynchronous(
+          'differential.getcommitmessage',
+          array(
+            'revision_id' => null,
+            'edit'        => 'create',
+            'fields'      => $fields,
+          ));
+      }
     }
 
     if ($included) {