diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index cdd39ceb9d7468a892881deb4d5ac76ef6186a7f..21c9005057c6fb424d3a45847af2d2a11154a5a8 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -543,7 +543,11 @@ export default function Sidebar() {
           description: error instanceof Error ? error.message : "An error occurred.",
         });
       }
-      cancelRename();
+      setRenamingThreadId((current) => {
+        if (current !== threadId) return current;
+        renamingInputRef.current = null;
+        return null;
+      });
     },
     [cancelRename],
   );