diff --git a/package.json b/package.json
index 12e6ac853..28c73d06f 100644
--- a/package.json
+++ b/package.json
@@ -177,7 +177,7 @@
     "fb-watchman": "^2.0.0",
     "flipper-doctor": "^0.7.0",
     "fs-extra": "^8.0.1",
-    "immer": "^5.3.5",
+    "immer": "^6.0.0",
     "immutable": "^4.0.0-rc.12",
     "invariant": "^2.2.2",
     "line-replace": "^1.0.2",
diff --git a/src/init.tsx b/src/init.tsx
index c8075ef73..1811b8f3e 100644
--- a/src/init.tsx
+++ b/src/init.tsx
@@ -33,10 +33,13 @@ import {store} from './store';
 import {registerRecordingHooks} from './utils/pluginStateRecorder';
 import {cache} from 'emotion';
 import {CacheProvider} from '@emotion/core';
+import {enableMapSet} from 'immer';
 
 const logger = initLogger(store);
 const bugReporter = new BugReporter(logger, store);
 
+enableMapSet();
+
 GK.init();
 
 const AppFrame = () => {
diff --git a/static/globalTestSetup.js b/static/globalTestSetup.js
index b01cb6659..20dea3ba7 100644
--- a/static/globalTestSetup.js
+++ b/static/globalTestSetup.js
@@ -8,3 +8,5 @@
  */
 
 global.fetch = require('jest-fetch-mock');
+
+require('immer').enableMapSet();
diff --git a/yarn.lock b/yarn.lock
index 84d485d5b..d6e4b744a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5561,10 +5561,10 @@ ignore@^5.1.1:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
   integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
 
-immer@^5.3.5:
-  version "5.3.5"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-5.3.5.tgz#6af4e1b74957b7d7ff9de6e170f59fa8e93e7462"
-  integrity sha512-bX74RWLu00PmYdyUnxjqSaszr/qPgO72okXU+CSAD+LIZOe7sgeva/bUn4Rn4wVoSg9wbsBXmU+TPEOKeaXO9g==
+immer@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/immer/-/immer-6.0.0.tgz#39cf65c7720c6ec4bdbd9ced0960b8ff126f3cd6"
+  integrity sha512-vqOfnW3+VEV6vVxniMLPxTI+tEz1w7POYwOE1okOfnOS9Zl/mCObxino2lxiDC5l9o4NdWy+Rkxk9Em6ThBZBA==
 
 immutable@^4.0.0-rc.12:
   version "4.0.0-rc.12"