diff --git a/src/main/apiServer/server.ts b/src/main/apiServer/server.ts
index 2555fa8c2e..69706fb763 100644
--- a/src/main/apiServer/server.ts
+++ b/src/main/apiServer/server.ts
@@ -1,5 +1,6 @@
 import { createServer } from 'node:http'
 
+import { agentService } from '../services/agents/AgentService'
 import { loggerService } from '../services/LoggerService'
 import { app } from './app'
 import { config } from './config'
@@ -18,6 +19,11 @@ export class ApiServer {
     // Load config
     const { port, host, apiKey } = await config.load()
 
+    // Initialize AgentService
+    logger.info('Initializing AgentService...')
+    await agentService.initialize()
+    logger.info('AgentService initialized successfully')
+
     // Create server with Express app
     this.server = createServer(app)
 
diff --git a/src/main/services/agents/AgentService.ts b/src/main/services/agents/AgentService.ts
index 4fb265be4b..08c0b15a51 100644
--- a/src/main/services/agents/AgentService.ts
+++ b/src/main/services/agents/AgentService.ts
@@ -202,7 +202,7 @@ export class AgentService {
   async createAgent(agentData: CreateAgentRequest): Promise<AgentEntity> {
     this.ensureInitialized()
 
-    const id = `agent_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`
+    const id = `agent_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`
     const now = new Date().toISOString()
 
     const serializedData = this.serializeJsonFields(agentData)
@@ -382,7 +382,7 @@ export class AgentService {
       throw new Error(`Agent with id ${sessionData.main_agent_id} does not exist`)
     }
 
-    const id = `session_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`
+    const id = `session_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`
     const now = new Date().toISOString()
 
     const serializedData = this.serializeJsonFields(sessionData)