diff --git a/frontend/src/pages/Mail.tsx b/frontend/src/pages/Mail.tsx
index 0f88614..9125b6a 100644
--- a/frontend/src/pages/Mail.tsx
+++ b/frontend/src/pages/Mail.tsx
@@ -282,7 +282,8 @@ export function MailPage() {
   }, []);
 
   // Register toolbar items
-  const { registerItems, unregisterPlugin } = usePluginToolbarStore();
+  const registerItems = usePluginToolbarStore((s) => s.registerItems);
+  const unregisterPlugin = usePluginToolbarStore((s) => s.unregisterPlugin);
   const selectedMailId = selectedMail?.id;
   const selectedMailFlagged = selectedMail?.is_flagged;
   useEffect(() => {
@@ -370,7 +371,7 @@ export function MailPage() {
       },
     ]);
     return () => unregisterPlugin('mail');
-  }, [registerItems, unregisterPlugin, accounts, selectedAccountId, selectedMailId, selectedMailFlagged, handleAccountSwitch, handleSearch, handleCompose, handleReply, handleForward, handleToggleFlag, handleCreateEvent]);
+  }, [accounts, selectedAccountId, selectedMailId, selectedMailFlagged, handleAccountSwitch, handleSearch, handleCompose, handleReply, handleForward, handleToggleFlag, handleCreateEvent]);
 
   if (loadingAccounts) {
     return (