diff --git a/src/routes/texting/$chatId.tsx b/src/routes/texting/$chatId.tsx
index 670f671..0427dd5 100644
--- a/src/routes/texting/$chatId.tsx
+++ b/src/routes/texting/$chatId.tsx
@@ -406,6 +406,23 @@ function TextingPage() {
     return null;
   }
 
+  const showNotification = (persona: string, message: string) => {
+    if (Notification.permission === 'granted') {
+      new Notification(persona, {
+        body: message,
+        icon: '/assets/pwa/android-chrome-192x192.png'
+      });
+    } else Notification.requestPermission();
+  };
+
+
+  useEffect(() => {
+    const lastMessage = messagesQuery.data?.messages[messagesQuery.data.messages.length - 1];
+    if (lastMessage && !lastMessage.isGenerating && lastMessage.role === 'assistant') {
+      showNotification(messagesQuery.data.chat.personas[0]?.name || 'AI', lastMessage.content);
+    }
+  }, [messagesQuery.data, showNotification]);
+
   return (
     <Texting
       layout="ChaiMessage"
diff --git a/src/server/models/Chat.ts b/src/server/models/Chat.ts
index 957dfb7..8c61623 100644
--- a/src/server/models/Chat.ts
+++ b/src/server/models/Chat.ts
@@ -306,12 +306,6 @@ export const Chat = {
           isGenerating: false,
         });
 
-        // Send a notification to the user
-        void WebPush.sendNotification({
-          title: persona.name,
-          message: aiResponse,
-        });
-
         return aiResponse;
       });
   },