diff --git a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
--- a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
+++ b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
@@ -295,6 +295,12 @@
   }
 
   public function removeSlugs(PhabricatorProject $project, array $slugs) {
+    // Do not remove the slug if it is the new primary slug to avoid a 404. If
+    // that's the case, drop it from the array - https://we.phorge.it/T15636
+    if (($key = array_search($project->getPrimarySlug(), $slugs)) !== false) {
+      unset($slugs[$key]);
+    }
+
     if (!$slugs) {
       return;
     }