diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php
index 085805e466..a4691fd492 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php
@@ -218,6 +218,9 @@ abstract class PhabricatorStandardCustomField
   }
 
   public function renderPropertyViewValue() {
+    if (!strlen($this->getFieldValue())) {
+      return null;
+    }
     return $this->getFieldValue();
   }
 
diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php
index adef408f49..c0cce662a5 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php
@@ -74,6 +74,9 @@ final class PhabricatorStandardCustomFieldSelect
   }
 
   public function renderPropertyViewValue() {
+    if (!strlen($this->getFieldValue())) {
+      return null;
+    }
     return idx($this->getOptions(), $this->getFieldValue());
   }