diff --git a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
index 65bf9df0d5..f53278b536 100644
--- a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
@@ -84,10 +84,13 @@ final class PhabricatorPeopleProfileEditController
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Edit Profile'))
-      ->setInfoView($note)
       ->setValidationException($validation_exception)
       ->setForm($form);
 
+    if ($note) {
+      $form_box->setInfoView($note);
+    }
+
     $nav = $this->buildIconNavView($user);
     $nav->selectFilter('/');
     $nav->appendChild($form_box);