diff --git a/components/rx/rxdbcolorbox.pas b/components/rx/rxdbcolorbox.pas
index 560a4789f..93b187a13 100644
--- a/components/rx/rxdbcolorbox.pas
+++ b/components/rx/rxdbcolorbox.pas
@@ -123,6 +123,8 @@ type
   end;
 
 implementation
+uses
+  LCLVersion;
 
 type
   TFieldDataLinkHack = class(TFieldDataLink)
@@ -313,7 +315,9 @@ begin
   FDataLink.OnDataChange := @DataChange;
   FDataLink.OnUpdateData := @UpdateData;
   FDataLink.OnActiveChange := @ActiveChange;
+  {$if (lcl_major = 0) and (lcl_release <= 30)}
   FDataLink.OnLayoutChange := @LayoutChange;
+  {$endif}
 end;
 
 destructor TRxCustomDBColorBox.Destroy;
diff --git a/components/rx/rxdbctrls.pas b/components/rx/rxdbctrls.pas
index 9e625ebb4..1648534c8 100644
--- a/components/rx/rxdbctrls.pas
+++ b/components/rx/rxdbctrls.pas
@@ -195,11 +195,7 @@ type
   end;
 
 implementation
-uses dbutils;
-
-type
-  TFieldDataLinkHack = class(TFieldDataLink)
-  end;
+uses dbutils, LCLVersion;
 
 { TCustomRxDBProgressBar }
 
@@ -264,7 +260,9 @@ begin
   FDataLink.Control := Self;
   FDataLink.OnDataChange := @DataChange;
   FDataLink.OnActiveChange := @ActiveChange;
+  {$if (lcl_major = 0) and (lcl_release <= 30)}
   FDataLink.OnLayoutChange := @LayoutChange;
+  {$endif}
 end;
 
 destructor TCustomRxDBProgressBar.Destroy;
@@ -344,7 +342,7 @@ begin
   if not FDatalink.Editing then
     FDatalink.Reset
   else
-    TFieldDataLinkHack(FDatalink).UpdateData;
+    FDatalink.UpdateRecord;
 end;
 
 function TCustomRxDBTrackBar.GetReadOnly: Boolean;
@@ -416,7 +414,9 @@ begin
   FDataLink.OnDataChange := @DataChange;
   FDataLink.OnUpdateData := @UpdateData;
   FDataLink.OnActiveChange := @ActiveChange;
+  {$if (lcl_major = 0) and (lcl_release <= 30)}
   FDataLink.OnLayoutChange := @LayoutChange;
+  {$endif}
 end;
 
 destructor TCustomRxDBTrackBar.Destroy;
diff --git a/components/rx/rxdbspinedit.pas b/components/rx/rxdbspinedit.pas
index eb575d5cc..c1047ab01 100644
--- a/components/rx/rxdbspinedit.pas
+++ b/components/rx/rxdbspinedit.pas
@@ -37,7 +37,7 @@ interface
 
 uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Spin,
-  DbCtrls, DB, LMessages, LCLType;
+  DbCtrls, DB, LMessages, LCLType, LCLVersion;
 
 
 type
@@ -302,7 +302,9 @@ begin
   FDataLink.OnDataChange := @DataChange;
   FDataLink.OnUpdateData := @UpdateData;
   FDataLink.OnActiveChange := @ActiveChange;
+  {$if (lcl_major = 0) and (lcl_release <= 30)}
   FDataLink.OnLayoutChange := @LayoutChange;
+  {$endif}
 end;
 
 destructor TCustomRxDBSpinEdit.Destroy;
diff --git a/components/rx/rxdbtimeedit.pas b/components/rx/rxdbtimeedit.pas
index a6da6e3ea..11b4bf4f9 100644
--- a/components/rx/rxdbtimeedit.pas
+++ b/components/rx/rxdbtimeedit.pas
@@ -136,7 +136,7 @@ type
 
 
 implementation
-uses dbutils;
+uses dbutils, LCLVersion;
 
 type
   TFieldDataLinkHack = class(TFieldDataLink)
@@ -305,7 +305,9 @@ begin
   FDataLink.OnDataChange := @DataChange;
   FDataLink.OnUpdateData := @UpdateData;
   FDataLink.OnActiveChange := @ActiveChange;
+  {$if (lcl_major = 0) and (lcl_release <= 30)}
   FDataLink.OnLayoutChange := @LayoutChange;
+  {$endif}
 end;
 
 destructor TCustomRxDBTimeEdit.Destroy;