diff --git a/cm_changelog.txt b/cm_changelog.txt
index 8d4cc74325..9247dd7dff 100644
--- a/cm_changelog.txt
+++ b/cm_changelog.txt
@@ -78,6 +78,7 @@ This is usable for any OpenTTD servers
 - Hid new auto-terraforming mode for polyrail behind a setting for now as it is still quite bugged.
 - Fixed auto-terraforming messing remove mode in polyrail tool.
 - Fixed modifer keys selection in settings ui.
+- Fixed red highlight on rail tools in remove mode.
 
 *** 12.0 (17 Oct 2021) ***
 - Automatically search servers when opening multiplayer window.
diff --git a/src/viewport.cpp b/src/viewport.cpp
index 2556cc7229..6d48505631 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -1181,7 +1181,7 @@ static void DrawTileSelection(const TileInfo *ti)
 		case HT_LINE: {
 			HighLightStyle type = GetPartOfAutoLine(ti->x, ti->y, _thd.selstart, _thd.selend, _thd.drawstyle & HT_DIR_MASK);
 			if (type < HT_DIR_END) {
-				DrawAutorailSelection(ti, type, _thd.cm_poly_terra && !_thd.make_square_red ? CM_SPR_PALETTE_ZONING_YELLOW : PAL_NONE);
+				DrawAutorailSelection(ti, type, _thd.cm_poly_terra && !_thd.make_square_red ? CM_SPR_PALETTE_ZONING_YELLOW : -1);
 			} else if (_thd.dir2 < HT_DIR_END) {
 				type = GetPartOfAutoLine(ti->x, ti->y, _thd.selstart2, _thd.selend2, _thd.dir2);
 				if (type < HT_DIR_END) DrawAutorailSelection(ti, type, PALETTE_SEL_TILE_BLUE);