diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs
index e86f46109..636d622eb 100644
--- a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs
+++ b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs
@@ -127,6 +127,8 @@ public Dictionary<string, string> Load(string conversationId, bool isReadOnly =
         _historyStates = _db.GetConversationStates(conversationId);
         var dialogs = _db.GetConversationDialogs(conversationId);
         var userDialogs = dialogs.Where(x => x.MetaData?.Role == AgentRole.User || x.MetaData?.Role == UserRole.Client)
+                                 .GroupBy(x => x.MetaData?.MessageId)
+                                 .Select(g => g.First())
                                  .OrderBy(x => x.MetaData?.CreateTime)
                                  .ToList();
         var curMsgIndex = userDialogs.FindIndex(x => !string.IsNullOrEmpty(curMsgId) && x.MetaData?.MessageId == curMsgId);
@@ -342,9 +344,17 @@ public void SaveStateByArgs(JsonDocument args)
         {
             foreach (JsonProperty property in root.EnumerateObject())
             {
-                if (!string.IsNullOrEmpty(property.Value.ToString()))
+                var propertyValue = property.Value;
+                var stateValue = propertyValue.ToString();
+                if (!string.IsNullOrEmpty(stateValue))
                 {
-                    SetState(property.Name, property.Value, source: StateSource.Application);
+                    if (propertyValue.ValueKind == JsonValueKind.True ||
+                        propertyValue.ValueKind == JsonValueKind.False)
+                    {
+                        stateValue = stateValue?.ToLower();
+                    }
+
+                    SetState(property.Name, stateValue, source: StateSource.Application);
                 }
             }
         }