diff --git a/src/view/layout/PhabricatorObjectItemView.php b/src/view/layout/PhabricatorObjectItemView.php
index 035af01b61..442b894421 100644
--- a/src/view/layout/PhabricatorObjectItemView.php
+++ b/src/view/layout/PhabricatorObjectItemView.php
@@ -288,16 +288,19 @@ final class PhabricatorObjectItemView extends AphrontView {
   private function renderHandleIcon(PhabricatorObjectHandle $handle, $label) {
     Javelin::initBehavior('phabricator-tooltips');
 
+    $options = array(
+      'class' => 'phabricator-object-item-handle-icon',
+      'style' => 'background: url('.$handle->getImageURI().')',
+    );
+
+    if (strlen($label)) {
+      $options['sigil'] = 'has-tooltip';
+      $options['meta']  = array('tip' => $label);
+    }
+
     return javelin_tag(
       'span',
-      array(
-        'class' => 'phabricator-object-item-handle-icon',
-        'sigil' => 'has-tooltip',
-        'style' => 'background: url('.$handle->getImageURI().')',
-        'meta' => array(
-          'tip' => $label,
-        ),
-      ),
+      $options,
       '');
   }