diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldText.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldText.php
index 56164bb7b5..758c50e817 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldText.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldText.php
@@ -11,7 +11,7 @@ final class PhabricatorStandardCustomFieldText
     $indexes = array();
 
     $value = $this->getFieldValue();
-    if (strlen($value)) {
+    if (phutil_nonempty_string($value)) {
       $indexes[] = $this->newStringIndex($value);
     }
 
@@ -30,7 +30,7 @@ final class PhabricatorStandardCustomFieldText
     PhabricatorCursorPagedPolicyAwareQuery $query,
     $value) {
 
-    if (strlen($value)) {
+    if (phutil_nonempty_string($value)) {
       $query->withApplicationSearchContainsConstraint(
         $this->newStringIndex(null),
         $value);