diff --git a/TelegramBotBase/Base/UpdateResult.cs b/TelegramBotBase/Base/UpdateResult.cs
index 82d46b3..de41c0a 100644
--- a/TelegramBotBase/Base/UpdateResult.cs
+++ b/TelegramBotBase/Base/UpdateResult.cs
@@ -16,6 +16,7 @@ public class UpdateResult : ResultBase
     /// </summary>
     public override long DeviceId =>
         RawData?.Message?.Chat?.Id
+        ?? RawData?.EditedMessage?.Chat?.Id
         ?? RawData?.CallbackQuery?.Message?.Chat?.Id
         ?? Device?.DeviceId
         ?? 0;
diff --git a/TelegramBotBase/MessageLoops/FormBaseMessageLoop.cs b/TelegramBotBase/MessageLoops/FormBaseMessageLoop.cs
index 0069c1b..4bec2a0 100644
--- a/TelegramBotBase/MessageLoops/FormBaseMessageLoop.cs
+++ b/TelegramBotBase/MessageLoops/FormBaseMessageLoop.cs
@@ -72,6 +72,12 @@ public class FormBaseMessageLoop : IMessageLoopFactory
             }
         }
 
+        //Message edited ?
+        if(update.Type == UpdateType.EditedMessage)
+        {
+            await activeForm.Edited(mr);
+        }
+
         //Action Event
         if (!session.FormSwitched && mr.IsAction)
         {
diff --git a/TelegramBotBase/MessageLoops/FullMessageLoop.cs b/TelegramBotBase/MessageLoops/FullMessageLoop.cs
index 2c4b1b9..1affd19 100644
--- a/TelegramBotBase/MessageLoops/FullMessageLoop.cs
+++ b/TelegramBotBase/MessageLoops/FullMessageLoop.cs
@@ -65,6 +65,12 @@ public class FullMessageLoop : IMessageLoopFactory
             }
         }
 
+        //Message edited ?
+        if (update.Type == UpdateType.EditedMessage)
+        {
+            await activeForm.Edited(mr);
+        }
+
         //Action Event
         if (!session.FormSwitched && mr.IsAction)
         {