diff --git a/src/renderer/components/TimelineSpace/Public.vue b/src/renderer/components/TimelineSpace/Public.vue
index 9b40dc80..2e4a9aeb 100644
--- a/src/renderer/components/TimelineSpace/Public.vue
+++ b/src/renderer/components/TimelineSpace/Public.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="public">
     <div class="public-timeline" v-for="message in timeline" v-bind:key="message.id">
-      <toot :message="message"></toot>
+      <toot :message="message" v-on:update="updateToot"></toot>
     </div>
   </div>
 </template>
@@ -24,6 +24,11 @@ export default {
   },
   beforeDestroy () {
     this.$store.dispatch('TimelineSpace/Public/stopPublicStreaming')
+  },
+  methods: {
+    updateToot (message) {
+      this.$store.commit('TimelineSpace/Public/updateToot', message)
+    }
   }
 }
 </script>
diff --git a/src/renderer/store/TimelineSpace/Public.js b/src/renderer/store/TimelineSpace/Public.js
index ee03f2ae..4aff8b65 100644
--- a/src/renderer/store/TimelineSpace/Public.js
+++ b/src/renderer/store/TimelineSpace/Public.js
@@ -8,6 +8,15 @@ const Public = {
   mutations: {
     appendTimeline (state, update) {
       state.timeline = [update].concat(state.timeline)
+    },
+    updateToot (state, message) {
+      state.timeline = state.timeline.map((toot) => {
+        if (toot.id === message.id) {
+          return message
+        } else {
+          return toot
+        }
+      })
     }
   },
   actions: {