diff --git a/src/context/inbox.tsx b/src/context/inbox.tsx
index 1356bf4c..311bb409 100644
--- a/src/context/inbox.tsx
+++ b/src/context/inbox.tsx
@@ -1,9 +1,8 @@
 import type { Accessor, JSX } from 'solid-js'
 import { createContext, createSignal, useContext } from 'solid-js'
-// import { createSubClient } from '../graphql/privateGraphQLClient'
 import type { Chat, Message, MutationCreateMessageArgs } from '../graphql/types.gen'
 import { apiClient } from '../utils/apiClient'
-// import type { Client } from '@urql/core'
+
 import { loadMessages } from '../stores/inbox'
 
 type InboxContextType = {
@@ -27,7 +26,20 @@ export function useInbox() {
 export const InboxProvider = (props: { children: JSX.Element }) => {
   const [chats, setChats] = createSignal<Chat[]>([])
   const [messages, setMessages] = createSignal<Message[]>([])
-  // const subclient = createMemo<Client>(() => createSubClient())
+  const eventSource = new EventSource('testapi.discours.io/connect')
+  // TODO: call /disconnect some time
+  // eslint-disable-next-line unicorn/prefer-add-event-listener
+  eventSource.onmessage = function (event) {
+    const message = JSON.parse(event.data)
+    // TODO: Do something with the message
+
+    console.log(message)
+  }
+
+  eventSource.onerror = function (event) {
+    console.error('EventSource failed:', event)
+    // TODO: Implement reconnection logic if needed
+  }
   const loadChats = async () => {
     try {
       const newChats = await apiClient.getChats({ limit: 50, offset: 0 })
@@ -69,15 +81,6 @@ export const InboxProvider = (props: { children: JSX.Element }) => {
     return chat
   }
 
-  // pipe(
-  //   subclient().subscription(newMessage, {}),
-  //   subscribe((result) => {
-  //     console.info('[subscription]')
-  //     console.debug(result)
-  //     // TODO: handle data result
-  //   })
-  // )
-
   const actions = {
     createChat,
     loadChats,
diff --git a/src/graphql/subs/new-message.ts b/src/graphql/subs/new-message.ts
deleted file mode 100644
index bb941a5f..00000000
--- a/src/graphql/subs/new-message.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { gql } from '@urql/core'
-
-export default gql`
-  subscription {
-    newMessage {
-      id
-      chatId
-      author
-      body
-      replyTo
-      createdAt
-      updatedAt
-    }
-  }
-`
diff --git a/src/graphql/subs/new-reaction.ts b/src/graphql/subs/new-reaction.ts
deleted file mode 100644
index 8ffd4cf8..00000000
--- a/src/graphql/subs/new-reaction.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { gql } from '@urql/core'
-
-export default gql`
-  subscription {
-    newReactions {
-      id
-      body
-      kind
-      range
-      createdAt
-      replyTo
-      stat {
-        rating
-      }
-      shout {
-        id
-        slug
-      }
-      createdBy {
-        name
-        slug
-        userpic
-      }
-    }
-  }
-`
diff --git a/src/graphql/subs/new-shout.ts b/src/graphql/subs/new-shout.ts
deleted file mode 100644
index 8172fd63..00000000
--- a/src/graphql/subs/new-shout.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { gql } from '@urql/core'
-
-export default gql`
-  subscription {
-    newShout {
-      id
-      slug
-      title
-      subtitle
-      body
-      topics {
-        # id
-        title
-        slug
-      }
-      authors {
-        id
-        name
-        slug
-        userpic
-        caption
-      }
-    }
-  }
-`