diff --git a/src/applications/tokens/controller/PhabricatorTokenGiveController.php b/src/applications/tokens/controller/PhabricatorTokenGiveController.php
--- a/src/applications/tokens/controller/PhabricatorTokenGiveController.php
+++ b/src/applications/tokens/controller/PhabricatorTokenGiveController.php
@@ -57,7 +57,11 @@
         ->setContentSource($content_source);
       if ($is_give) {
         $token_phid = $request->getStr('tokenPHID');
-        $editor->addToken($handle->getPHID(), $token_phid);
+        if ($token_phid) {
+          $editor->addToken($handle->getPHID(), $token_phid);
+        }
+        // T16006 - if no $token_phid provided, ignore and go back to task
+        return id(new AphrontReloadResponse())->setURI($done_uri);
       } else {
         $editor->deleteToken($handle->getPHID());
       }