diff --git a/packages/tokens-studio-for-figma/src/app/components/globalStyles.tsx b/packages/tokens-studio-for-figma/src/app/components/globalStyles.tsx
index 320550628..8fbaf13eb 100644
--- a/packages/tokens-studio-for-figma/src/app/components/globalStyles.tsx
+++ b/packages/tokens-studio-for-figma/src/app/components/globalStyles.tsx
@@ -1,5 +1,4 @@
 import { globalCss } from '@/stitches.config';
-import '@/app/assets/fonts/fonts.css';
 
 export const globalStyles = globalCss({
   body: {
diff --git a/packages/tokens-studio-for-figma/src/app/index.tsx b/packages/tokens-studio-for-figma/src/app/index.tsx
index a8696c2f6..212dd0af0 100644
--- a/packages/tokens-studio-for-figma/src/app/index.tsx
+++ b/packages/tokens-studio-for-figma/src/app/index.tsx
@@ -1,4 +1,5 @@
 import 'regenerator-runtime/runtime';
+import './assets/fonts/fonts.css';
 import './assets/fonts/jetbrainsmono.css';
 import './styles/preflight.css';
 import '@/i18n';
diff --git a/packages/tokens-studio-for-figma/webpack.config.js b/packages/tokens-studio-for-figma/webpack.config.js
index 9254e0941..83906b66a 100644
--- a/packages/tokens-studio-for-figma/webpack.config.js
+++ b/packages/tokens-studio-for-figma/webpack.config.js
@@ -39,6 +39,9 @@ module.exports = wrapper((env, argv) => {
     // This is necessary because Figma's 'eval' works differently than normal eval
     devtool: argv.mode === 'production' ? 'source-map' : 'inline-source-map',
 
+    // Disable persistent caching in development to avoid module resolution issues
+    cache: argv.mode === 'production' ? { type: 'memory' } : false,
+
     entry: {
       ui: './src/app/index.tsx', // The entry point for your UI code
       code: './src/plugin/controller.ts', // The entry point for your plugin code