diff --git a/TelegramBotBase/BotBase.cs b/TelegramBotBase/BotBase.cs
index c86695e..249910b 100644
--- a/TelegramBotBase/BotBase.cs
+++ b/TelegramBotBase/BotBase.cs
@@ -252,7 +252,6 @@ namespace TelegramBotBase
                 OnSessionBegins(new SessionBeginEventArgs(e.DeviceId, ds));
             }
 
-            ds.ChatTitle = e.Message.Chat.Username ?? e.Message.Chat.Title;
             ds.LastAction = DateTime.Now;
             ds.LastMessage = e.Message;
 
@@ -351,7 +350,6 @@ namespace TelegramBotBase
                 e.Device = ds;
             }
 
-            ds.ChatTitle = e.Message.Chat.Username ?? e.Message.Chat.Title;
             ds.LastAction = DateTime.Now;
             ds.LastMessage = e.Message;
 
@@ -396,7 +394,6 @@ namespace TelegramBotBase
                 e.Device = ds;
             }
 
-            ds.ChatTitle = e.Message.Chat.Username ?? e.Message.Chat.Title;
             ds.LastAction = DateTime.Now;
             ds.LastMessage = e.Message;
 
diff --git a/TelegramBotBase/SessionBase.cs b/TelegramBotBase/SessionBase.cs
index 8efdd26..9991681 100644
--- a/TelegramBotBase/SessionBase.cs
+++ b/TelegramBotBase/SessionBase.cs
@@ -211,12 +211,11 @@ namespace TelegramBotBase
 
                 var form = s.Value.ActiveForm;
 
-
                 try
                 {
                     var se = new StateEntry();
                     se.DeviceId = s.Key;
-                    se.ChatTitle = s.Value.ChatTitle;
+                    se.ChatTitle = s.Value.GetChatTitle();
                     se.FormUri = form.GetType().FullName;
                     se.QualifiedName = form.GetType().AssemblyQualifiedName;