diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
index 521f3054..45ede9dc 100644
--- a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
+++ b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
@@ -85,7 +85,10 @@ public partial class ConversationService
         {
             foreach (JsonProperty property in root.EnumerateObject())
             {
-                stateService.SetState(property.Name, property.Value.ToString());
+                if (!string.IsNullOrEmpty(property.Value.ToString()))
+                {
+                    stateService.SetState(property.Name, property.Value.ToString());
+                }
             }
         }
     }