diff --git a/dashboard/pages/project_creation.vue b/dashboard/pages/project_creation.vue
index 3cb4ef3..70a28ba 100644
--- a/dashboard/pages/project_creation.vue
+++ b/dashboard/pages/project_creation.vue
@@ -44,6 +44,7 @@ async function createProject() {
             await actions.setActiveProject(newActiveProjectId);
         }
 
+        setPageLayout('dashboard');
         router.push('/');
 
     } catch (ex: any) {
diff --git a/dashboard/server/api/ai/send_message.post.ts b/dashboard/server/api/ai/send_message.post.ts
index 5e4b66b..e7dd86b 100644
--- a/dashboard/server/api/ai/send_message.post.ts
+++ b/dashboard/server/api/ai/send_message.post.ts
@@ -1,5 +1,6 @@
 import { sendMessageOnChat, updateChatStatus } from "~/server/services/AiService";
 import { getAiChatRemainings } from "./chats_remaining";
+import { ProjectLimitModel } from "@schema/project/ProjectsLimits";
 
 
 
@@ -15,6 +16,9 @@ export default defineEventHandler(async event => {
     const chatsRemaining = await getAiChatRemainings(pid);
     if (chatsRemaining <= 0) return setResponseStatus(event, 400, 'CHAT_LIMIT_REACHED');
 
+
+    await ProjectLimitModel.updateOne({ project_id: pid }, { $inc: { ai_messages: 1 } });
+
     const currentStatus: string[] = [];
 
     let responseSent = false;
diff --git a/dashboard/server/services/AiService.ts b/dashboard/server/services/AiService.ts
index 6e7772d..8a93ca3 100644
--- a/dashboard/server/services/AiService.ts
+++ b/dashboard/server/services/AiService.ts
@@ -191,7 +191,7 @@ export async function sendMessageOnChat(text: string, pid: string, time_offset:
 
     if (chatMessages && chatMessages.length > 0) {
         messages.push(...chatMessages);
-        await ProjectLimitModel.updateOne({ project_id: pid }, { $inc: { ai_messages: 1 } })
+
         await updateChatStatus(chat_id, '', false);
     } else {
         const roleMessage: OpenAI.Chat.Completions.ChatCompletionMessageParam = {