diff --git a/lcl/include/customedit.inc b/lcl/include/customedit.inc
index 2a408e763d..e626b4b473 100644
--- a/lcl/include/customedit.inc
+++ b/lcl/include/customedit.inc
@@ -472,7 +472,7 @@ begin
   if not (wcfCreatingHandle in FWinControlFlags) then
   begin
     Modified := True;
-    if HandleAllocated then
+    if ([csLoading,csDestroying]*ComponentState=[]) then
       Change;
   end;
 end;