diff --git a/src/__tests__/integration/services/task-assignment-notification.test.ts b/src/__tests__/integration/services/task-assignment-notification.test.ts
index 13c7db48a7..dddf4a5f82 100644
--- a/src/__tests__/integration/services/task-assignment-notification.test.ts
+++ b/src/__tests__/integration/services/task-assignment-notification.test.ts
@@ -83,7 +83,7 @@ describe("TASK_ASSIGNED notification", () => {
 
     await updateTicket(task.id, owner.id, { assigneeId: assignee.id });
 
-    await new Promise((r) => setTimeout(r, 100));
+    await new Promise((r) => setTimeout(r, 500));
 
     const record = await db.notificationTrigger.findFirst({
       where: {
@@ -145,7 +145,7 @@ describe("TASK_ASSIGNED notification", () => {
 
     await updateTicket(plainTask.id, plainOwner.id, { assigneeId: plainAssignee.id });
 
-    await new Promise((r) => setTimeout(r, 100));
+    await new Promise((r) => setTimeout(r, 500));
 
     const record = await db.notificationTrigger.findFirst({
       where: {
@@ -162,7 +162,7 @@ describe("TASK_ASSIGNED notification", () => {
   it("does NOT create a notification when self-assigning", async () => {
     await updateTicket(task.id, owner.id, { assigneeId: owner.id });
 
-    await new Promise((r) => setTimeout(r, 100));
+    await new Promise((r) => setTimeout(r, 500));
 
     const records = await db.notificationTrigger.findMany({
       where: { notificationType: NotificationTriggerType.TASK_ASSIGNED },
@@ -174,7 +174,7 @@ describe("TASK_ASSIGNED notification", () => {
   it("does NOT create a notification for system assignees", async () => {
     await updateTicket(task.id, owner.id, { assigneeId: "system:task-coordinator" });
 
-    await new Promise((r) => setTimeout(r, 100));
+    await new Promise((r) => setTimeout(r, 500));
 
     const records = await db.notificationTrigger.findMany({
       where: { notificationType: NotificationTriggerType.TASK_ASSIGNED },
@@ -239,7 +239,7 @@ describe("TASK_ASSIGNED notification — DM not configured (no lightningPubkey)"
   it("creates a SKIPPED notification_trigger row when user has no lightningPubkey", async () => {
     await updateTicket(task.id, owner.id, { assigneeId: assignee.id });
 
-    await new Promise((r) => setTimeout(r, 100));
+    await new Promise((r) => setTimeout(r, 500));
 
     const record = await db.notificationTrigger.findFirst({
       where: {
diff --git a/src/components/WorkspaceSwitcher.tsx b/src/components/WorkspaceSwitcher.tsx
index 7cc5ebe015..7f645cab03 100644
--- a/src/components/WorkspaceSwitcher.tsx
+++ b/src/components/WorkspaceSwitcher.tsx
@@ -7,7 +7,6 @@ import {
   DropdownMenuItem,
   DropdownMenuLabel,
   DropdownMenuSeparator,
-  DropdownMenuShortcut,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { Skeleton } from "@/components/ui/skeleton";
@@ -248,7 +247,6 @@ export function WorkspaceSwitcher({
                           {workspace.name}
                         </div>
                       </div>
-                      <DropdownMenuShortcut>⌘{index + 2}</DropdownMenuShortcut>
                     </DropdownMenuItem>
                   ))}
               </>