diff --git a/src/applications/files/query/PhabricatorFileSearchEngine.php b/src/applications/files/query/PhabricatorFileSearchEngine.php
index c565ba9204..125a0bce87 100644
--- a/src/applications/files/query/PhabricatorFileSearchEngine.php
+++ b/src/applications/files/query/PhabricatorFileSearchEngine.php
@@ -127,7 +127,9 @@ final class PhabricatorFileSearchEngine
   protected function getRequiredHandlePHIDsForResultList(
     array $files,
     PhabricatorSavedQuery $query) {
-    return mpull($files, 'getAuthorPHID');
+
+    // Remove non-manually created files which do not have an author
+    return mpull(mfilter($files, 'getAuthorPHID'), 'getAuthorPHID');
   }
 
   /**