diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java
index deb0507..c7d0cb5 100644
--- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java
+++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java
@@ -455,7 +455,9 @@
               codeOwnersConfig, codeOwnerResolver, changeNotes, accountIds);
       ChangedFilesByPatchSetCache changedFilesByPatchSetCache =
           changedFilesByPatchSetCacheFactory.create(codeOwnersConfig, changeNotes);
-      // TODO: check if rename detection can be disabled here
+      // The returned FileCodeOwnerStatus are used for the response of the GetOwnedPath REST
+      // endpoint, which is documented to detect renames. Hence the rename detection should be
+      // enabled here.
       return changedFiles
           .get(changeNotes.getProjectName(), patchSet.commitId(), /* enableRenameDetection= */ true)
           .stream()
