diff --git a/src/stores/streaming.js b/src/stores/streaming.js
index 5129a571d..1b4d07292 100644
--- a/src/stores/streaming.js
+++ b/src/stores/streaming.js
@@ -131,6 +131,7 @@ export const useStreamingStore = defineStore('streaming', {
     },
 
     getSubArgs(stream) {
+      if (stream === undefined) return undefined
       const argumentKey = ARGUMENT_MAP[stream.name]
       const args = argumentKey
         ? {
diff --git a/src/stores/timelines.js b/src/stores/timelines.js
index fe098587a..a6fdcc64f 100644
--- a/src/stores/timelines.js
+++ b/src/stores/timelines.js
@@ -105,10 +105,9 @@ export const useTimelinesStore = defineStore('timelines', {
         const openHandler = () => this.onStreamConnect(timelineName, argument)
         const closeHandler = () =>
           this.onStreamDisconnect(timelineName, argument)
-        const messageHandler =
-          () =>
-          ({ detail: message }) =>
-            this.onStreamMessage(timelineName, argument, message)
+        const messageHandler = (message) => {
+          this.onStreamMessage(timelineName, argument, message)
+        }
 
         et.addEventListener('open', openHandler)
         et.addEventListener('close', closeHandler)
@@ -231,7 +230,7 @@ export const useTimelinesStore = defineStore('timelines', {
     },
     onStreamMessage(timeline, argument, event) {
       this.addStatusesToTimeline(timeline, argument, {
-        statuses: [event.data.status.id],
+        statuses: event.data.map(({ id }) => id),
       })
     },