diff --git a/src/applications/repository/engine/PhabricatorRepositoryRefEngine.php b/src/applications/repository/engine/PhabricatorRepositoryRefEngine.php
index 56826186a1..cfcf3b7041 100644
--- a/src/applications/repository/engine/PhabricatorRepositoryRefEngine.php
+++ b/src/applications/repository/engine/PhabricatorRepositoryRefEngine.php
@@ -304,8 +304,9 @@ final class PhabricatorRepositoryRefEngine
     $all_commits = queryfx_all(
       $conn_w,
       'SELECT id, commitIdentifier, importStatus FROM %T
-        WHERE commitIdentifier IN (%Ls)',
+        WHERE repositoryID = %d AND commitIdentifier IN (%Ls)',
       $commit_table->getTableName(),
+      $repository->getID(),
       $identifiers);
 
     $closeable_flag = PhabricatorRepositoryCommit::IMPORTED_CLOSEABLE;
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
index be8a0d25e8..8661f56f60 100644
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -592,6 +592,10 @@ final class PhabricatorRepository extends PhabricatorRepositoryDAO
       return false;
     }
 
+    if (!$this->shouldTrackBranch($branch)) {
+      return false;
+    }
+
     return $this->isBranchInFilter($branch, 'close-commits-filter');
   }