diff --git a/packages/chart/src/ChartThemeProvider.tsx b/packages/chart/src/ChartThemeProvider.tsx
index c13dc179c9..0cd0eeabf5 100644
--- a/packages/chart/src/ChartThemeProvider.tsx
+++ b/packages/chart/src/ChartThemeProvider.tsx
@@ -20,10 +20,7 @@ export function ChartThemeProvider({
 }: ChartThemeProviderProps): JSX.Element {
   const { activeThemes } = useTheme();
 
-  const chartTheme = useMemo(
-    () => (activeThemes == null ? null : defaultChartTheme()),
-    [activeThemes]
-  );
+  const chartTheme = useMemo(defaultChartTheme, [activeThemes]);
 
   return (
     <ChartThemeContext.Provider value={chartTheme}>
diff --git a/packages/iris-grid/src/IrisGridThemeProvider.tsx b/packages/iris-grid/src/IrisGridThemeProvider.tsx
index 775fc947aa..d5e5d177c2 100644
--- a/packages/iris-grid/src/IrisGridThemeProvider.tsx
+++ b/packages/iris-grid/src/IrisGridThemeProvider.tsx
@@ -16,10 +16,7 @@ export function IrisGridThemeProvider({
 }: IrisGridThemeProviderProps): JSX.Element {
   const { activeThemes } = useTheme();
 
-  const gridTheme = useMemo(
-    () => (activeThemes == null ? null : createDefaultIrisGridTheme()),
-    [activeThemes]
-  );
+  const gridTheme = useMemo(createDefaultIrisGridTheme, [activeThemes]);
 
   return (
     <IrisGridThemeContext.Provider value={gridTheme}>