diff --git a/server/services/baileys/auth-state.ts b/server/services/baileys/auth-state.ts
index 97f7c67..4d62c5e 100644
--- a/server/services/baileys/auth-state.ts
+++ b/server/services/baileys/auth-state.ts
@@ -3,10 +3,14 @@
  * Stores credentials and keys in the database instead of files
  */
 import type { AuthenticationCreds, SignalDataTypeMap } from '@whiskeysockets/baileys'
-import pkg from '@whiskeysockets/baileys'
-const { initAuthCreds, BufferJSON, proto } = pkg
+import * as baileys from '@whiskeysockets/baileys'
 import { query } from '../../utils/database'
 
+// Get functions from baileys module
+const initAuthCreds = (baileys as any).initAuthCreds || (baileys as any).default?.initAuthCreds
+const BufferJSON = (baileys as any).BufferJSON || (baileys as any).default?.BufferJSON
+const proto = (baileys as any).proto || (baileys as any).default?.proto
+
 export interface PostgresAuthState {
   state: {
     creds: AuthenticationCreds
diff --git a/server/services/baileys/manager.ts b/server/services/baileys/manager.ts
index f4aef50..a019893 100644
--- a/server/services/baileys/manager.ts
+++ b/server/services/baileys/manager.ts
@@ -3,14 +3,15 @@
  * Singleton pattern for managing all Baileys connections
  */
 import type { WASocket, BaileysEventMap } from '@whiskeysockets/baileys'
-import pkg from '@whiskeysockets/baileys'
-const {
-  default: makeWASocket,
-  DisconnectReason,
-  fetchLatestBaileysVersion,
-  makeCacheableSignalKeyStore,
-  Browsers
-} = pkg
+import * as baileys from '@whiskeysockets/baileys'
+
+// Get functions from baileys module (handle both ESM and CJS)
+const makeWASocket = (baileys as any).default || (baileys as any).makeWASocket
+const DisconnectReason = (baileys as any).DisconnectReason || (baileys as any).default?.DisconnectReason
+const fetchLatestBaileysVersion = (baileys as any).fetchLatestBaileysVersion || (baileys as any).default?.fetchLatestBaileysVersion
+const makeCacheableSignalKeyStore = (baileys as any).makeCacheableSignalKeyStore || (baileys as any).default?.makeCacheableSignalKeyStore
+const Browsers = (baileys as any).Browsers || (baileys as any).default?.Browsers
+
 import { Boom } from '@hapi/boom'
 import { EventEmitter } from 'events'
 import QRCode from 'qrcode'