diff --git a/src/features/workspace/components/__tests__/workspace-name.test.tsx b/src/features/workspace/components/__tests__/workspace-name.test.tsx
index d83ff4cb..624cdaf8 100644
--- a/src/features/workspace/components/__tests__/workspace-name.test.tsx
+++ b/src/features/workspace/components/__tests__/workspace-name.test.tsx
@@ -56,12 +56,15 @@ test("can't rename active workspace", async () => {
 });
 
 test("can't rename archived workspace", async () => {
-  const { getByRole } = render(
+  const { getByRole, queryByText } = render(
     <WorkspaceName workspaceName="foo" isArchived={true} />,
   );
 
   expect(getByRole("textbox", { name: /workspace name/i })).toBeDisabled();
   expect(getByRole("button", { name: /save/i })).toBeDisabled();
+  expect(
+    queryByText(/cannot rename the default workspace/i),
+  ).not.toBeInTheDocument();
 });
 
 test("can't rename default workspace", async () => {
diff --git a/src/features/workspace/components/workspace-name.tsx b/src/features/workspace/components/workspace-name.tsx
index adb8add7..e7f4580a 100644
--- a/src/features/workspace/components/workspace-name.tsx
+++ b/src/features/workspace/components/workspace-name.tsx
@@ -70,7 +70,9 @@ export function WorkspaceName({
           <FormButtons
             isPending={isPending}
             formErrorMessage={errorMsg}
-            formSideNote="Cannot rename the default workspace"
+            formSideNote={
+              isDefault ? "Cannot rename the default workspace" : undefined
+            }
             formState={formState}
             canSubmit={!isArchived}
           />