diff --git a/src/applications/maniphest/controller/ManiphestExportController.php b/src/applications/maniphest/controller/ManiphestExportController.php
index b0c39737fc..1872efc97c 100644
--- a/src/applications/maniphest/controller/ManiphestExportController.php
+++ b/src/applications/maniphest/controller/ManiphestExportController.php
@@ -60,7 +60,14 @@ final class ManiphestExportController extends ManiphestController {
       ->withQueryKeys(array($this->key))
       ->executeOne();
     if (!$saved) {
-      return new Aphront404Response();
+      $engine = id(new ManiphestTaskSearchEngine())
+        ->setViewer($user);
+      if ($engine->isBuiltinQuery($this->key)) {
+        $saved = $engine->buildSavedQueryFromBuiltin($this->key);
+      }
+      if (!$saved) {
+        return new Aphront404Response();
+      }
     }
 
     $formats = ManiphestExcelFormat::loadAllFormats();