diff --git a/src/applications/transactions/bulk/type/BulkTokenizerParameterType.php b/src/applications/transactions/bulk/type/BulkTokenizerParameterType.php
index 0edc46c664..a48f8877d5 100644
--- a/src/applications/transactions/bulk/type/BulkTokenizerParameterType.php
+++ b/src/applications/transactions/bulk/type/BulkTokenizerParameterType.php
@@ -23,7 +23,6 @@ final class BulkTokenizerParameterType
     $template_markup = $template->render();
 
     $datasource = $this->getDatasource();
-    $limit = null;
 
     return array(
       'markup' => (string)hsprintf('%s', $template_markup),
@@ -31,7 +30,7 @@ final class BulkTokenizerParameterType
         'src' => $datasource->getDatasourceURI(),
         'browseURI' => $datasource->getBrowseURI(),
         'placeholder' => $datasource->getPlaceholderText(),
-        'limit' => $limit,
+        'limit' => $datasource->getLimit(),
       ),
       'value' => null,
     );
diff --git a/src/applications/transactions/editfield/PhabricatorTokenizerEditField.php b/src/applications/transactions/editfield/PhabricatorTokenizerEditField.php
index d657213456..ba7514085d 100644
--- a/src/applications/transactions/editfield/PhabricatorTokenizerEditField.php
+++ b/src/applications/transactions/editfield/PhabricatorTokenizerEditField.php
@@ -60,6 +60,10 @@ abstract class PhabricatorTokenizerEditField
     $datasource = $this->newDatasource()
       ->setViewer($this->getViewer());
 
+    if ($this->getIsSingleValue()) {
+      $datasource->setLimit(1);
+    }
+
     return id(new BulkTokenizerParameterType())
       ->setDatasource($datasource);
   }
diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
index 65c112c684..cdb54fb7e9 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
@@ -68,6 +68,11 @@ abstract class PhabricatorStandardCustomFieldTokenizer
   protected function newBulkParameterType() {
     $datasource = $this->getDatasource();
 
+    $limit = $this->getFieldConfigValue('limit');
+    if ($limit) {
+      $datasource->setLimit($limit);
+    }
+
     return id(new BulkTokenizerParameterType())
       ->setDatasource($datasource);
   }