diff --git a/desktop/plugins/public/ui-debugger/index.tsx b/desktop/plugins/public/ui-debugger/index.tsx
index a418dd2c2..3598d1e08 100644
--- a/desktop/plugins/public/ui-debugger/index.tsx
+++ b/desktop/plugins/public/ui-debugger/index.tsx
@@ -130,12 +130,9 @@ export function plugin(client: PluginClient<Events>) {
   const seenNodes = new Set<Id>();
   client.onMessage('subtreeUpdate', (event) => {
     liveClientData = produce(liveClientData, (draft) => {
-      // FIXME: remove node id from snapshot as is always
-      // for the entire screen.
-      const nodeId = rootId.get();
-      if (event.snapshot && nodeId) {
+      if (event.snapshot) {
         draft.snapshotInfo = {
-          nodeId,
+          nodeId: event.rootId,
           base64Image: event.snapshot,
         };
       }