diff --git a/components/tachart/tacustomsource.pas b/components/tachart/tacustomsource.pas
index acaef35b73..b73f3234a9 100644
--- a/components/tachart/tacustomsource.pas
+++ b/components/tachart/tacustomsource.pas
@@ -547,6 +547,9 @@ end;
 procedure TCustomChartSource.EndUpdate;
 begin
   Dec(FUpdateCount);
+  if FUpdateCount > 0 then exit;
+  // Values can be set directly between BeginUpdate and EndUpdate.
+  InvalidateCaches;
   Notify;
 end;