diff --git a/dist/index.js b/dist/index.js
index 3031cac6..7e0a0ff7 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -1714,7 +1714,8 @@
       },
       task: {
         newBoardNamePlaceholder: "Create a board",
-        createBoardButtonAudioLabel: "create board"
+        createBoardButtonAudioLabel: "create board",
+        noBoardSelected: "No board selected"
       }
     }
   };
@@ -2005,6 +2006,19 @@
   // src/View/ChatPages/taskPage.tsx
   function TaskPage(taskPageViewModel) {
     taskPageViewModel.loadData();
+    const paneContent = createProxyState(
+      [taskPageViewModel.selectedBoard],
+      () => {
+        const selectedBoard = taskPageViewModel.selectedBoard.value;
+        if (selectedBoard == void 0) {
+          return [
+            /* @__PURE__ */ createElement("div", { class: "content align-center justify-center" }, /* @__PURE__ */ createElement("span", { class: "secondary" }, translations.chatPage.task.noBoardSelected))
+          ];
+        } else {
+          return [/* @__PURE__ */ createElement("div", { class: "toolbar" }), /* @__PURE__ */ createElement("div", { class: "content" })];
+        }
+      }
+    );
     return /* @__PURE__ */ createElement("div", { id: "task-page" }, /* @__PURE__ */ createElement("div", { class: "pane side" }, /* @__PURE__ */ createElement("div", { class: "toolbar" }, /* @__PURE__ */ createElement("div", { class: "flex-row width-input" }, /* @__PURE__ */ createElement(
       "input",
       {
@@ -2031,7 +2045,7 @@
           BoardInfoToEntry
         ]
       }
-    ))), /* @__PURE__ */ createElement("div", { class: "pane" }, /* @__PURE__ */ createElement("div", { class: "toolbar" }), /* @__PURE__ */ createElement("div", { class: "content" })));
+    ))), /* @__PURE__ */ createElement("div", { class: "pane", "children:set": paneContent }));
   }
 
   // src/View/chatPage.tsx
diff --git a/src/View/ChatPages/taskPage.tsx b/src/View/ChatPages/taskPage.tsx
index 08c06712..f56dfd3e 100644
--- a/src/View/ChatPages/taskPage.tsx
+++ b/src/View/ChatPages/taskPage.tsx
@@ -7,6 +7,24 @@ import { translations } from "../translations";
 export function TaskPage(taskPageViewModel: TaskPageViewModel) {
   taskPageViewModel.loadData();
 
+  const paneContent = React.createProxyState(
+    [taskPageViewModel.selectedBoard],
+    () => {
+      const selectedBoard = taskPageViewModel.selectedBoard.value;
+      if (selectedBoard == undefined) {
+        return [
+          <div class="content align-center justify-center">
+            <span class="secondary">
+              {translations.chatPage.task.noBoardSelected}
+            </span>
+          </div>,
+        ];
+      } else {
+        return [<div class="toolbar"></div>, <div class="content"></div>];
+      }
+    }
+  );
+
   return (
     <div id="task-page">
       <div class="pane side">
@@ -40,10 +58,8 @@ export function TaskPage(taskPageViewModel: TaskPageViewModel) {
           ></div>
         </div>
       </div>
-      <div class="pane">
-        <div class="toolbar"></div>
-        <div class="content"></div>
-      </div>
+
+      <div class="pane" children:set={paneContent}></div>
     </div>
   );
 }
diff --git a/src/View/translations.ts b/src/View/translations.ts
index f4fc2b2e..3b34f112 100644
--- a/src/View/translations.ts
+++ b/src/View/translations.ts
@@ -126,6 +126,8 @@ const englishTranslations = {
     task: {
       newBoardNamePlaceholder: "Create a board",
       createBoardButtonAudioLabel: "create board",
+
+      noBoardSelected: "No board selected",
     },
   },
 };