diff --git a/dist/index.js b/dist/index.js
index 8188c295..827b6a6e 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2356,23 +2356,23 @@
 
   // src/View/chatPage.tsx
   function ChatPage(chatViewModel) {
-    const mainContent = new State(/* @__PURE__ */ createElement("div", null));
-    chatViewModel.selectedPage.subscribe((selectedPage) => {
-      chatViewModel.closeSubPages();
-      switch (selectedPage) {
-        case "settings" /* Settings */: {
-          mainContent.value = SettingsPage(chatViewModel.settingsPageViewModel);
-          break;
-        }
-        case "tasks" /* Tasks */: {
-          mainContent.value = TaskPage(chatViewModel.taskPageViewModel);
-          break;
-        }
-        default: {
-          mainContent.value = MessagePage(chatViewModel.messagePageViewModel);
+    const mainContent = createProxyState(
+      [chatViewModel.selectedPage],
+      () => {
+        chatViewModel.closeSubPages();
+        switch (chatViewModel.selectedPage.value) {
+          case "settings" /* Settings */: {
+            return SettingsPage(chatViewModel.settingsPageViewModel);
+          }
+          case "tasks" /* Tasks */: {
+            return TaskPage(chatViewModel.taskPageViewModel);
+          }
+          default: {
+            return MessagePage(chatViewModel.messagePageViewModel);
+          }
         }
       }
-    });
+    );
     return /* @__PURE__ */ createElement(
       "article",
       {
diff --git a/src/View/chatPage.tsx b/src/View/chatPage.tsx
index b44c150a..985ea43a 100644
--- a/src/View/chatPage.tsx
+++ b/src/View/chatPage.tsx
@@ -11,25 +11,24 @@ import { TaskPage } from "./ChatPages/taskPage";
 import { translations } from "./translations";
 
 export function ChatPage(chatViewModel: ChatViewModel) {
-  const mainContent = new React.State(<div></div>);
+  const mainContent = React.createProxyState(
+    [chatViewModel.selectedPage],
+    () => {
+      chatViewModel.closeSubPages();
 
-  chatViewModel.selectedPage.subscribe((selectedPage) => {
-    chatViewModel.closeSubPages();
-
-    switch (selectedPage) {
-      case ChatPageType.Settings: {
-        mainContent.value = SettingsPage(chatViewModel.settingsPageViewModel);
-        break;
-      }
-      case ChatPageType.Tasks: {
-        mainContent.value = TaskPage(chatViewModel.taskPageViewModel);
-        break;
-      }
-      default: {
-        mainContent.value = MessagePage(chatViewModel.messagePageViewModel);
+      switch (chatViewModel.selectedPage.value) {
+        case ChatPageType.Settings: {
+          return SettingsPage(chatViewModel.settingsPageViewModel);
+        }
+        case ChatPageType.Tasks: {
+          return TaskPage(chatViewModel.taskPageViewModel);
+        }
+        default: {
+          return MessagePage(chatViewModel.messagePageViewModel);
+        }
       }
     }
-  });
+  );
 
   return (
     <article