diff --git a/app/src/components/Sidebar/Sidebar.tsx b/app/src/components/Sidebar/Sidebar.tsx
index 4e257cf..c6bbdd7 100644
--- a/app/src/components/Sidebar/Sidebar.tsx
+++ b/app/src/components/Sidebar/Sidebar.tsx
@@ -31,7 +31,7 @@ function useUpdateNodeWhenNodeReceivesUpdates(node?: q.TreeNode<any>) {
   const [lastUpdate, setLastUpdate] = useState(0)
   const updateNode = useCallback(
     throttle(() => {
-      setLastUpdate(node ? node.lastUpdate : 0)
+      setLastUpdate(Date.now())
     }, 300),
     [node]
   )
diff --git a/backend/src/Model/TreeNode.ts b/backend/src/Model/TreeNode.ts
index f495751..227c27b 100644
--- a/backend/src/Model/TreeNode.ts
+++ b/backend/src/Model/TreeNode.ts
@@ -57,7 +57,9 @@ export class TreeNode<ViewModel extends Destroyable> {
 
   set decoder(override: IDecoder | undefined) {
     this._decoder = override
-    this.message && this.onMerge.dispatch()
+
+    // Hack to force frontend to update
+    this.message && this.onMessage.dispatch(this.message)
   }
 
   decodeMessage(message: Message): Base64Message | null {