diff --git a/lcl/include/dbedit.inc b/lcl/include/dbedit.inc
index 7985062fcc..df72ab92e8 100644
--- a/lcl/include/dbedit.inc
+++ b/lcl/include/dbedit.inc
@@ -222,9 +222,8 @@ end;
 procedure TDBEdit.WMKillFocus(var Message: TLMKillFocus);
 begin
   inherited WMKillFocus(Message);
-
   FFocusedDisplay := False;
-
+  if csDestroying in ComponentState then Exit;
   if FDatalink.Editing then
   begin
     FDatalink.UpdateRecord;