diff --git a/Client/UfrmMain.pas b/Client/UfrmMain.pas
index 9748dbd..b1f6c2d 100644
--- a/Client/UfrmMain.pas
+++ b/Client/UfrmMain.pas
@@ -746,10 +746,10 @@ begin
   if (not acSelect.Checked) and (targetTile <> nil) and (SelectedTile <> nil) then
   begin
     targetRect := GetSelectedRect;
-    FUndoList.Clear;
 
     if (SelectedTile = targetTile) or ConfirmAction then
     begin
+      FUndoList.Clear;
       if acDraw.Checked then                        //***** Drawing Mode *****//
       begin
         for tileX := FSelection.Left to FSelection.Right do
@@ -1217,7 +1217,9 @@ begin
     dmNetwork.Send(FUndoList[i]);
 
   //Cleanup without freeing the objects (this was already done by dmNetwork.Send)
+  FUndoList.FreeObjects := False;
   FUndoList.Clear;
+  FUndoList.FreeObjects := True;
 
   //No Undo packets, nothing to undo.
   acUndo.Enabled := False;