diff --git a/src/citymania/cm_highlight.cpp b/src/citymania/cm_highlight.cpp
index 15dbbaf945..e7784d1cba 100644
--- a/src/citymania/cm_highlight.cpp
+++ b/src/citymania/cm_highlight.cpp
@@ -1192,7 +1192,7 @@ TileHighlight ObjectHighlight::GetTileHighlight(const TileInfo *ti) {
         auto &oth = t->second;
         switch (oth.type) {
             case ObjectTileHighlight::Type::RAIL_DEPOT:
-            case ObjectTileHighlight::Type::RAIL_TRACK:
+            // case ObjectTileHighlight::Type::RAIL_TRACK:  Depot track shouldn't remove foundation
             case ObjectTileHighlight::Type::RAIL_STATION:
             case ObjectTileHighlight::Type::RAIL_SIGNAL:
             case ObjectTileHighlight::Type::RAIL_BRIDGE_HEAD:
diff --git a/src/viewport.cpp b/src/viewport.cpp
index bf4840ddae..e6f20d3045 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -726,7 +726,6 @@ void AddSortableSpriteToDraw(SpriteID image, PaletteID pal, int x, int y, int w,
 
 	if (!ignore_highlight_pal) {
 		if (_vd.cm_highlight.structure_pal) pal = _vd.cm_highlight.structure_pal;
-		if (pal == CM_PALETTE_HIDE_SPRITE) return;
 	}
 
 	/* make the sprites transparent with the right palette */
@@ -741,6 +740,7 @@ void AddSortableSpriteToDraw(SpriteID image, PaletteID pal, int x, int y, int w,
 	}
 
 	_vd.last_child = nullptr;
+	if (!ignore_highlight_pal && pal == CM_PALETTE_HIDE_SPRITE) return;
 
 	Point pt = RemapCoords(x, y, z);
 	int tmp_left, tmp_top, tmp_x = pt.x, tmp_y = pt.y;