diff --git a/events/index.ts b/events/index.ts
index 81f22d9..c78b36f 100644
--- a/events/index.ts
+++ b/events/index.ts
@@ -1,5 +1,8 @@
 export * from './Events'
 export * from './EventsV2'
 export * from './EventSystem/EventDispatcher'
-export * from './EventSystem/EventBus'
+// EventBus exports removed - this file contains Electron-specific imports
+// which should not be loaded in server/browser mode
+// Electron code should import directly from './EventSystem/EventBus'
+// export * from './EventSystem/EventBus'
 export * from './EventSystem/EventBusInterface'
diff --git a/src/electron.ts b/src/electron.ts
index f7d853d..cf44602 100644
--- a/src/electron.ts
+++ b/src/electron.ts
@@ -19,7 +19,8 @@ import {
 import { shouldAutoUpdate, handleAutoUpdate } from './autoUpdater'
 import { registerCrashReporter } from './registerCrashReporter'
 import { makeOpenDialogRpc, makeSaveDialogRpc } from '../events/OpenDialogRequest'
-import { backendRpc, backendEvents, getAppVersion, writeToFile, readFromFile } from '../events'
+import { getAppVersion, writeToFile, readFromFile } from '../events'
+import { backendRpc, backendEvents } from '../events/EventSystem/EventBus'
 import { RpcEvents } from '../events/EventsV2'
 
 registerCrashReporter()