diff --git a/app/api/chat/conversations/route.ts b/app/api/chat/conversations/route.ts
index d0ebbf0..045109e 100644
--- a/app/api/chat/conversations/route.ts
+++ b/app/api/chat/conversations/route.ts
@@ -14,8 +14,8 @@ const createConversationSchema = z.object({
 
 const getConversationsSchema = z.object({
   language: z.enum(['ro', 'en']).optional(),
-  limit: z.string().transform(Number).pipe(z.number().min(1).max(50)).optional().default(20),
-  offset: z.string().transform(Number).pipe(z.number().min(0)).optional().default(0),
+  limit: z.string().transform(Number).pipe(z.number().min(1).max(50)).optional().default('20'),
+  offset: z.string().transform(Number).pipe(z.number().min(0)).optional().default('0'),
 })
 
 // GET /api/chat/conversations - List user's conversations
diff --git a/components/chat/floating-chat.tsx b/components/chat/floating-chat.tsx
index dc786fb..36efdb0 100644
--- a/components/chat/floating-chat.tsx
+++ b/components/chat/floating-chat.tsx
@@ -24,6 +24,7 @@ import {
   DialogTitle,
   DialogContent,
   DialogActions,
+  CircularProgress,
 } from '@mui/material'
 import {
   Chat,
@@ -39,7 +40,6 @@ import {
   History,
   Add,
   Delete,
-  CircularProgress,
   MoreVert,
   Edit,
 } from '@mui/icons-material'
@@ -351,7 +351,7 @@ export default function FloatingChat() {
         headers,
         body: JSON.stringify({
           message: inputMessage,
-          conversationId: activeConversationId,
+          ...(activeConversationId && { conversationId: activeConversationId }),
           history: messages.slice(-5), // Fallback for anonymous users
           locale: locale,
         }),