diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs
index a7f12136..2fb397b1 100644
--- a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs
+++ b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs
@@ -55,7 +55,7 @@ public class ConversationStateService : IConversationStateService, IDisposable
 
         _savedStates = _db.GetConversationState(_conversationId);
 
-        if (_savedStates != null)
+        if (!_savedStates.IsNullOrEmpty())
         {
             foreach (var data in _savedStates)
             {