diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp
--- a/src/tree_cmd.cpp
+++ b/src/tree_cmd.cpp
@@ -330,16 +330,16 @@ CommandCost CmdPlantTree(TileIndex tile,
 						default: break;
 					}
 
-					if (_game_mode != GM_EDITOR && IsValidPlayer(_current_player)) {
-						Town *t = ClosestTownFromTile(tile, _patches.dist_local_authority);
-						if (t != NULL)
-							ChangeTownRating(t, RATING_TREE_UP_STEP, RATING_TREE_MAXIMUM);
-					}
-
 					if (flags & DC_EXEC) {
 						TreeType treetype;
 						uint growth;
 
+						if (_game_mode != GM_EDITOR && IsValidPlayer(_current_player)) {
+							Town *t = ClosestTownFromTile(tile, _patches.dist_local_authority);
+							if (t != NULL)
+								ChangeTownRating(t, RATING_TREE_UP_STEP, RATING_TREE_MAXIMUM);
+						}
+
 						treetype = (TreeType)p1;
 						if (treetype == TREE_INVALID) {
 							treetype = GetRandomTreeType(tile, GB(Random(), 24, 8));
@@ -488,7 +488,7 @@ static CommandCost ClearTile_Trees(TileI
 {
 	uint num;
 
-	if (IsValidPlayer(_current_player)) {
+	if ((flags & DC_EXEC) && IsValidPlayer(_current_player)) {
 		Town *t = ClosestTownFromTile(tile, _patches.dist_local_authority);
 		if (t != NULL)
 			ChangeTownRating(t, RATING_TREE_DOWN_STEP, RATING_TREE_MINIMUM);