diff --git a/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas b/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas
index e0a942c5e..6987ad042 100644
--- a/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas
+++ b/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas
@@ -16441,15 +16441,11 @@ begin
   if tsVCLDragging in FStates then
     ImageList_DragShowNolock(False);
   {$endif}
-  //todo: workaround to bug 18211. Remove when fixed.
-  {$ifndef LCLCarbon}
+
   if csPaintCopy in ControlState then
     FUpdateRect := ClientRect
   else
     FUpdateRect := Message.PaintStruct^.rcPaint;
-  {$else}
-  FUpdateRect := ClientRect;
-  {$endif}
 
   {$ifdef DEBUG_VTV}Logger.Send([lcPaint],'FUpdateRect', FUpdateRect);{$endif}