diff --git a/frontend/src/pages/Communication.tsx b/frontend/src/pages/Communication.tsx
index 8ca185d..fda6620 100644
--- a/frontend/src/pages/Communication.tsx
+++ b/frontend/src/pages/Communication.tsx
@@ -755,7 +755,8 @@ export function CommunicationPage() {
   const [loading, setLoading] = useState(true);
   const [showNewChat, setShowNewChat] = useState<ConversationCategory | null>(null);
   const [mobileView, setMobileView] = useState<'list' | 'chat'>('list');
-  const { registerItems, unregisterPlugin } = usePluginToolbarStore();
+  const registerItems = usePluginToolbarStore((s) => s.registerItems);
+  const unregisterPlugin = usePluginToolbarStore((s) => s.unregisterPlugin);
 
   const loadConversations = useCallback(async () => {
     try {
diff --git a/frontend/src/pages/Reports.tsx b/frontend/src/pages/Reports.tsx
index dc21f11..4bc45d9 100644
--- a/frontend/src/pages/Reports.tsx
+++ b/frontend/src/pages/Reports.tsx
@@ -60,7 +60,8 @@ interface DownloadEntry {
 export function ReportsPage() {
   const { t } = useTranslation();
   const toast = useToast();
-  const { registerItems, unregisterPlugin } = usePluginToolbarStore();
+  const registerItems = usePluginToolbarStore((s) => s.registerItems);
+  const unregisterPlugin = usePluginToolbarStore((s) => s.unregisterPlugin);
 
   // Data hooks
   const { data: templates = [], isLoading: templatesLoading } = useReportTemplates();
diff --git a/frontend/src/pages/Tasks.tsx b/frontend/src/pages/Tasks.tsx
index 7db320f..372d001 100644
--- a/frontend/src/pages/Tasks.tsx
+++ b/frontend/src/pages/Tasks.tsx
@@ -220,7 +220,8 @@ function TaskDetail({ task, onEdit, onDelete, onStatusChange }: TaskDetailProps)
 export function TasksPage() {
   const { t } = useTranslation();
   const toast = useToast();
-  const { registerItems, unregisterPlugin } = usePluginToolbarStore();
+  const registerItems = usePluginToolbarStore((s) => s.registerItems);
+  const unregisterPlugin = usePluginToolbarStore((s) => s.unregisterPlugin);
 
   const [page, setPage] = useState(1);
   const [filter, setFilter] = useState<TaskFilter>({});