diff --git a/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php b/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
index 800cbe598c..bd56a473d0 100644
--- a/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
@@ -58,15 +58,13 @@ final class DifferentialRevisionViewController extends DifferentialController {
       }
     }
 
-    foreach ($diffs as $diff) {
-      if ($diff->getCreationMethod() != 'commit') {
-        $last_manual = $diff;
-      }
-    }
-
     $target_manual = $target;
     if (!$target_id) {
-      $target_manual = $last_manual;
+      foreach ($diffs as $diff) {
+        if ($diff->getCreationMethod() != 'commit') {
+          $target_manual = $diff;
+        }
+      }
     }
 
     $diffs = mpull($diffs, null, 'getID');
@@ -87,7 +85,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
 
     $comments = $revision->loadComments();
     $comments = array_merge(
-      $this->getImplicitComments($revision, $last_manual),
+      $this->getImplicitComments($revision, reset($diffs)),
       $comments);
 
     $all_changesets = $changesets;