diff --git a/packages/app/src/Components/Tasks/NoticeZapPool.tsx b/packages/app/src/Components/Tasks/NoticeZapPool.tsx
index 42ccdf9c..6d143a61 100644
--- a/packages/app/src/Components/Tasks/NoticeZapPool.tsx
+++ b/packages/app/src/Components/Tasks/NoticeZapPool.tsx
@@ -2,12 +2,13 @@ import { FormattedMessage, FormattedNumber } from "react-intl";
 import { Link } from "react-router-dom";
 
 import { BaseUITask } from "@/Components/Tasks/index";
+import { Wallets } from "@/Wallet";
 
 export class NoticeZapPoolDefault extends BaseUITask {
   id = "zap-pool-default";
 
   check(): boolean {
-    return !this.state.muted && CONFIG.defaultZapPoolFee !== undefined;
+    return !this.state.muted && CONFIG.defaultZapPoolFee !== 0 && !!Wallets.snapshot().wallet?.isReady();
   }
 
   render() {
diff --git a/packages/app/src/Components/Tasks/TaskList.tsx b/packages/app/src/Components/Tasks/TaskList.tsx
index 76c60cba..7b4a3cf6 100644
--- a/packages/app/src/Components/Tasks/TaskList.tsx
+++ b/packages/app/src/Components/Tasks/TaskList.tsx
@@ -20,7 +20,10 @@ class TaskStore extends ExternalStore<Array<UITask>> {
 
   constructor() {
     super();
-    const AllTasks: Array<UITask> = [new BackupKeyTask(), new Nip5Task(), new DonateTask(), new NoticeZapPoolDefault()];
+    const AllTasks: Array<UITask> = [new BackupKeyTask(), new Nip5Task(), new DonateTask()];
+    if (CONFIG.features.zapPool) {
+      AllTasks.push(new NoticeZapPoolDefault());
+    }
     if (CONFIG.features.subscriptions) {
       AllTasks.push(new RenewSubTask());
     }