diff --git a/packages/client/src/App.jsx b/packages/client/src/App.jsx
index b0b2082..b12a535 100644
--- a/packages/client/src/App.jsx
+++ b/packages/client/src/App.jsx
@@ -38,11 +38,11 @@ export default function App({ onSwitchToGame, onSwitchToWorkshop }) {
     return unsub;
   }, []);
 
-  // Auto-load on mount, or load chiptune demo if empty
+  // Auto-load on mount, but skip if modules already loaded (e.g. from Workshop)
   useEffect(() => {
+    if (state.modules.length > 0) return; // Already loaded (Workshop, etc.)
     const loaded = autoLoad();
     if (!loaded || state.modules.length === 0) {
-      // Load chiptune demo preset
       deserialize(CHIPTUNE_PRESET);
     }
   }, []);