diff --git a/desktop/app/src/Client.tsx b/desktop/app/src/Client.tsx
index dbe21d902..13483049e 100644
--- a/desktop/app/src/Client.tsx
+++ b/desktop/app/src/Client.tsx
@@ -39,6 +39,8 @@ import {batch} from 'react-redux';
 import {_SandyPluginInstance} from 'flipper-plugin';
 import {flipperMessagesClientPlugin} from './utils/self-inspection/plugins/FlipperMessagesClientPlugin';
 import {getFlipperLibImplementation} from './utils/flipperLibImplementation';
+import {freeze} from 'immer';
+import GK from './fb-stubs/GK';
 
 type Plugins = Array<string>;
 
@@ -133,6 +135,7 @@ export default class Client extends EventEmitter {
   connection: FlipperClientConnection<any, any> | null | undefined;
   store: Store;
   activePlugins: Set<string>;
+  freezeData = GK.get('flipper_frozen_data');
 
   /**
    * @deprecated
@@ -395,6 +398,9 @@ export default class Client extends EventEmitter {
       let rawData;
       try {
         rawData = JSON.parse(msg);
+        if (this.freezeData) {
+          rawData = freeze(rawData, true);
+        }
       } catch (err) {
         console.error(`Invalid JSON: ${msg}`, 'clientMessage');
         return;
diff --git a/desktop/plugins/fresco/index.tsx b/desktop/plugins/fresco/index.tsx
index ced02004f..a36e309c7 100644
--- a/desktop/plugins/fresco/index.tsx
+++ b/desktop/plugins/fresco/index.tsx
@@ -132,7 +132,10 @@ export default class FlipperImagesPlugin extends FlipperPlugin<
         ) {
           const surface = attribution[0] ? attribution[0].trim() : undefined;
           if (surface && surface.length > 0) {
-            pluginData.surfaceList.add(surface);
+            pluginData.surfaceList = new Set([
+              ...pluginData.surfaceList,
+              surface,
+            ]);
           }
         }
         pluginData = {
@@ -182,16 +185,17 @@ export default class FlipperImagesPlugin extends FlipperPlugin<
     } else if (method == 'events') {
       const event: ImageEvent = data as ImageEvent;
       debugLog('Received events', event);
-      const {surfaceList} = persistedState;
+      let {surfaceList} = persistedState;
       const {attribution} = event;
       if (attribution instanceof Array && attribution.length > 0) {
         const surface = attribution[0] ? attribution[0].trim() : undefined;
         if (surface && surface.length > 0) {
-          surfaceList.add(surface);
+          surfaceList = new Set([...surfaceList, surface]);
         }
       }
       return {
         ...persistedState,
+        surfaceList,
         events: [
           {eventId: persistedState.nextEventId, ...event},
           ...persistedState.events,