diff --git a/src/applications/people/controller/settings/PhabricatorUserSettingsController.php b/src/applications/people/controller/settings/PhabricatorUserSettingsController.php
index 6b013f056f..941bf55e3c 100644
--- a/src/applications/people/controller/settings/PhabricatorUserSettingsController.php
+++ b/src/applications/people/controller/settings/PhabricatorUserSettingsController.php
@@ -73,8 +73,11 @@ class PhabricatorUserSettingsController extends PhabricatorPeopleController {
             ->setURI('/settings/page/arcanist/?regenerated=true');
         case 'account':
           if (!empty($_FILES['profile'])) {
-            $file = PhabricatorFile::newFromPHPUpload($_FILES['profile']);
-            $user->setProfileImagePHID($file->getPHID());
+            $err = idx($_FILES['profile'], 'error');
+            if ($err != UPLOAD_ERR_NO_FILE) {
+              $file = PhabricatorFile::newFromPHPUpload($_FILES['profile']);
+              $user->setProfileImagePHID($file->getPHID());
+            }
           }
 
           $user->save();