diff --git a/Civi/Token/TokenRow.php b/Civi/Token/TokenRow.php
index 4f186d3d5c1e..5a223beb33a3 100644
--- a/Civi/Token/TokenRow.php
+++ b/Civi/Token/TokenRow.php
@@ -142,7 +142,7 @@ public function customToken($entity, $customFieldID, $entityID) {
     ));
 
     // format the raw custom field value into proper display value
-    if ($fieldValue) {
+    if (isset($fieldValue)) {
       $fieldValue = \CRM_Core_BAO_CustomField::displayValue($fieldValue, $customFieldID);
     }