diff --git a/components/tvplanit/examples/fulldemo/mormotdemo.lpi b/components/tvplanit/examples/fulldemo/mormotdemo.lpi
index 1a7e52a8c..9dfee0fef 100644
--- a/components/tvplanit/examples/fulldemo/mormotdemo.lpi
+++ b/components/tvplanit/examples/fulldemo/mormotdemo.lpi
@@ -26,7 +26,6 @@
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
-        <CommandLineParams Value="-noserver"/>
       </local>
     </RunParams>
     <RequiredPackages Count="3">
diff --git a/components/tvplanit/source/vpbaseds.pas b/components/tvplanit/source/vpbaseds.pas
index 3b16dab78..52aab3cdd 100644
--- a/components/tvplanit/source/vpbaseds.pas
+++ b/components/tvplanit/source/vpbaseds.pas
@@ -815,13 +815,13 @@ procedure TVpCustomDataStore.NotifyDependents;
 var
   I: Integer;
 begin
-  if (Owner = nil) or Loading then                                    
+  if (FLinkedOwner = nil) or Loading then                                    
     Exit;
 
-  for I := 0 to pred(Owner.ComponentCount) do begin
-    if (Owner.Components[I] is TVpLinkableControl) then begin
-      if (TVpLinkableControl(Owner.Components[I]).DataStore = self) then
-        TVpLinkableControl(Owner.Components[I]).Invalidate;
+  for I := 0 to pred(FLinkedOwner.ComponentCount) do begin
+    if (FLinkedOwner.Components[I] is TVpLinkableControl) then begin
+      if (TVpLinkableControl(FLinkedOwner.Components[I]).DataStore = self) then
+        TVpLinkableControl(FLinkedOwner.Components[I]).Invalidate;
     end
   end;
   NotifyLinked;