diff --git a/ui/.storybook/config.js b/ui/.storybook/config.js
index 7a2448751..147acc59f 100644
--- a/ui/.storybook/config.js
+++ b/ui/.storybook/config.js
@@ -8,6 +8,8 @@ import {
 
 import createPercyAddon from "@percy-io/percy-storybook";
 
+import "mobx-react-lite/batchingForReactDom";
+
 import { advanceTo } from "jest-date-mock";
 
 import { ThemeContext } from "Components/Theme";
diff --git a/ui/src/index.tsx b/ui/src/index.tsx
index 782c9d31c..5985559ba 100644
--- a/ui/src/index.tsx
+++ b/ui/src/index.tsx
@@ -9,6 +9,8 @@ import ReactDOM from "react-dom";
 
 import Moment from "react-moment";
 
+import "mobx-react-lite/batchingForReactDom";
+
 import {
   SettingsElement,
   SetupSentry,
diff --git a/ui/src/setupTests.js b/ui/src/setupTests.js
index 7f5f6cfd4..21bdd7fb5 100644
--- a/ui/src/setupTests.js
+++ b/ui/src/setupTests.js
@@ -3,6 +3,8 @@ import Adapter from "enzyme-adapter-react-16";
 
 import { FetchRetryConfig } from "Common/Fetch";
 
+import "mobx-react-lite/batchingForReactDom";
+
 // https://github.com/airbnb/enzyme
 Enzyme.configure({ adapter: new Adapter() });