diff --git a/src/Mewdeko/Modules/OwnerOnly/Services/OwnerOnlyService.cs b/src/Mewdeko/Modules/OwnerOnly/Services/OwnerOnlyService.cs
index a2dfd60dc..cb9bf687a 100644
--- a/src/Mewdeko/Modules/OwnerOnly/Services/OwnerOnlyService.cs
+++ b/src/Mewdeko/Modules/OwnerOnly/Services/OwnerOnlyService.cs
@@ -38,7 +38,7 @@ public class OwnerOnlyService : ILateExecutor, IReadyExecutor, INService
     private readonly Replacer rep;
     private readonly IBotStrings strings;
     private readonly GuildSettingsService guildSettings;
-    private static readonly Dictionary<ulong, Conversation> UserConversations = new Dictionary<ulong, Conversation>();
+    private static readonly Dictionary<ulong, Conversation> UserConversations = new();
 
 #pragma warning disable CS8714
     private ConcurrentDictionary<ulong?, ConcurrentDictionary<int, Timer>> autoCommands =
@@ -313,41 +313,41 @@ private async Task OnMessageReceived(SocketMessage args)
             return;
         if (args is not IUserMessage usrMsg)
             return;
-        // try
-        // {
-        if (args.Content is "deletesession")
+        try
         {
-            if (UserConversations.TryGetValue(args.Author.Id, out _))
+            if (args.Content is "deletesession")
             {
-                ClearConversation(args.Author.Id);
-                await args.Channel.SendConfirmAsync("Conversation deleted.");
+                if (UserConversations.TryGetValue(args.Author.Id, out _))
+                {
+                    ClearConversation(args.Author.Id);
+                    await args.Channel.SendConfirmAsync("Conversation deleted.");
+                    return;
+                }
+
+                await args.Channel.SendErrorAsync("You dont have a conversation saved.", bss.Data);
                 return;
             }
 
-            await args.Channel.SendErrorAsync("You dont have a conversation saved.", bss.Data);
-            return;
-        }
+            await using var dbContext = await dbProvider.GetContextAsync();
 
-        await using var dbContext = await dbProvider.GetContextAsync();
-
-        (Database.Models.OwnerOnly actualItem, bool added) toUpdate = dbContext.OwnerOnly.Any()
-            ? (await dbContext.OwnerOnly.FirstOrDefaultAsync(), false)
-            : (new Database.Models.OwnerOnly
-            {
-                GptTokensUsed = 0
-            }, true);
-
-        var loadingMsg = await usrMsg.Channel.SendConfirmAsync($"{bss.Data.LoadingEmote} Awaiting response...");
-        await StreamResponseAndUpdateEmbedAsync(bss.Data.ChatGptKey, bss.Data.ChatGptModel,
-            bss.Data.ChatGptInitPrompt +
-            $"The users name is {args.Author}, you are in the discord server {guildChannel.Guild} and in the channel {guildChannel} and there are {(await guildChannel.GetUsersAsync().FlattenAsync()).Count()} users that can see this channel.",
-            loadingMsg, toUpdate, args.Author, args.Content);
-        //}
-        // catch (Exception e)
-        // {
-        //     Log.Warning(e, "Error in ChatGPT");
-        //     await usrMsg.SendErrorReplyAsync("Something went wrong, please try again later.");
-        // }
+            (Database.Models.OwnerOnly actualItem, bool added) toUpdate = dbContext.OwnerOnly.Any()
+                ? (await dbContext.OwnerOnly.FirstOrDefaultAsync(), false)
+                : (new Database.Models.OwnerOnly
+                {
+                    GptTokensUsed = 0
+                }, true);
+
+            var loadingMsg = await usrMsg.Channel.SendConfirmAsync($"{bss.Data.LoadingEmote} Awaiting response...");
+            await StreamResponseAndUpdateEmbedAsync(bss.Data.ChatGptKey, bss.Data.ChatGptModel,
+                bss.Data.ChatGptInitPrompt +
+                $"The users name is {args.Author}, you are in the discord server {guildChannel.Guild} and in the channel {guildChannel} and there are {(await guildChannel.GetUsersAsync().FlattenAsync()).Count()} users that can see this channel.",
+                loadingMsg, toUpdate, args.Author, args.Content);
+        }
+        catch (Exception e)
+        {
+            Log.Warning(e, "Error in ChatGPT");
+            await usrMsg.SendErrorReplyAsync("Something went wrong, please try again later.");
+        }
     }
 
     private static void ClearConversation(ulong userId)
@@ -362,7 +362,6 @@ private async Task StreamResponseAndUpdateEmbedAsync(string apiKey, string model
         using var httpClient = httpFactory.CreateClient();
         httpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {apiKey}");
 
-        // Get or create conversation for this user
         if (!UserConversations.TryGetValue(author.Id, out var conversation))
         {
             conversation = new Conversation();
@@ -373,7 +372,6 @@ private async Task StreamResponseAndUpdateEmbedAsync(string apiKey, string model
             UserConversations[author.Id] = conversation;
         }
 
-        // Add user message to conversation
         conversation.Messages.Add(new Message
         {
             Role = "user", Content = userPrompt
@@ -387,7 +385,11 @@ private async Task StreamResponseAndUpdateEmbedAsync(string apiKey, string model
                 role = m.Role, content = m.Content
             }).ToArray(),
             stream = true,
-            user = author.Id.ToString()
+            user = author.Id.ToString(),
+            stream_options = new
+            {
+                include_usage = true
+            }
         };
 
         var content = new StringContent(System.Text.Json.JsonSerializer.Serialize(requestBody), Encoding.UTF8,
@@ -402,6 +404,7 @@ private async Task StreamResponseAndUpdateEmbedAsync(string apiKey, string model
         var responseBuilder = new StringBuilder();
         var lastUpdate = DateTimeOffset.UtcNow;
         var totalTokens = 0;
+        var lastResponse = new ChatCompletionChunkResponse();
 
         while (!reader.EndOfStream)
         {
@@ -411,7 +414,7 @@ private async Task StreamResponseAndUpdateEmbedAsync(string apiKey, string model
             if (!line.StartsWith("data: ")) continue;
             var json = line[6..];
             var chatResponse = JsonConvert.DeserializeObject<ChatCompletionChunkResponse>(json);
-
+            lastResponse = chatResponse;
             if (chatResponse?.Choices is not { Count: > 0 }) continue;
             var conversationContent = chatResponse.Choices[0].Delta?.Content;
             if (string.IsNullOrEmpty(conversationContent)) continue;
@@ -419,7 +422,9 @@ private async Task StreamResponseAndUpdateEmbedAsync(string apiKey, string model
             if (!((DateTimeOffset.UtcNow - lastUpdate).TotalSeconds >= 1)) continue;
             lastUpdate = DateTimeOffset.UtcNow;
             var embeds = BuildEmbeds(responseBuilder.ToString(), author,
-                toUpdate.actualItem.GptTokensUsed + totalTokens);
+                chatResponse.Usage is not null ? toUpdate.actualItem.GptTokensUsed + chatResponse.Usage.TotalTokens : toUpdate.actualItem.GptTokensUsed);
+            if (chatResponse.Usage is not null)
+                totalTokens += chatResponse.Usage.TotalTokens;
             await loadingMsg.ModifyAsync(m => m.Embeds = embeds.ToArray());
         }
 
@@ -436,7 +441,7 @@ private async Task StreamResponseAndUpdateEmbedAsync(string apiKey, string model
         }
 
         await using var dbContext = await dbProvider.GetContextAsync();
-        toUpdate.actualItem.GptTokensUsed += totalTokens;
+        toUpdate.actualItem.GptTokensUsed += lastResponse.Usage.TotalTokens;
 
         if (toUpdate.added)
             dbContext.OwnerOnly.Add(toUpdate.actualItem);
@@ -1033,6 +1038,21 @@ private class ChatCompletionChunkResponse
 
         [JsonProperty("choices", NullValueHandling = NullValueHandling.Ignore)]
         public List<Choice> Choices;
+
+        [JsonProperty("usage", NullValueHandling = NullValueHandling.Include)]
+        public Usage? Usage;
+    }
+
+    private class Usage
+    {
+        [JsonProperty("prompt_tokens", NullValueHandling = NullValueHandling.Ignore)]
+        public int PromptTokens;
+
+        [JsonProperty("completion_tokens", NullValueHandling = NullValueHandling.Ignore)]
+        public int CompletionTokens;
+
+        [JsonProperty("total_tokens", NullValueHandling = NullValueHandling.Ignore)]
+        public int TotalTokens;
     }
 
     private class Conversation
@@ -1045,4 +1065,6 @@ private class Message
         public string Role { get; set; }
         public string Content { get; set; }
     }
+
+
 }
\ No newline at end of file