diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationService.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationService.cs
index 9df6ae7f6..055db3cc8 100644
--- a/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationService.cs
+++ b/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationService.cs
@@ -51,6 +51,7 @@ Task<bool> SendMessage(string agentId,
     /// </summary>
     /// <param name="resetStates">Whether to reset all states</param>
     /// <param name="reason">Append user init words</param>
+    /// <param name="excludedStates"></param>
     /// <returns></returns>
-    Task UpdateBreakpoint(bool resetStates = false, string? reason = null);
+    Task UpdateBreakpoint(bool resetStates = false, string? reason = null, params string[] excludedStates);
 }
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.UpdateBreakpoint.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.UpdateBreakpoint.cs
index 7453a2020..8f88f44f3 100644
--- a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.UpdateBreakpoint.cs
+++ b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.UpdateBreakpoint.cs
@@ -4,7 +4,7 @@ namespace BotSharp.Core.Conversations.Services;
 
 public partial class ConversationService : IConversationService
 {
-    public async Task UpdateBreakpoint(bool resetStates = false, string? reason = null)
+    public async Task UpdateBreakpoint(bool resetStates = false, string? reason = null, params string[] excludedStates)
     {
         var db = _services.GetRequiredService<IBotSharpRepository>();
         var routingCtx = _services.GetRequiredService<IRoutingContext>();
@@ -22,7 +22,13 @@ public async Task UpdateBreakpoint(bool resetStates = false, string? reason = nu
         {
             var states = _services.GetRequiredService<IConversationStateService>();
             // keep language state
-            states.CleanStates(StateConst.LANGUAGE);
+            if (excludedStates == null) excludedStates = new string[] { };
+            if (!excludedStates.Contains(StateConst.LANGUAGE))
+            {
+                excludedStates = excludedStates.Append(StateConst.LANGUAGE).ToArray();
+            }
+
+            states.CleanStates(excludedStates);
         }
 
         var hooks = _services.GetServices<IConversationHook>()