diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 9fcd078f2a..41c21751e3 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2476,7 +2476,8 @@ void StationPickerDrawSprite(int x, int y, StationType st, RailType railtype, Ro
 		DrawSprite(SPR_TRAMWAY_TRAM + (t->ground.sprite == SPR_ROAD_PAVED_STRAIGHT_X ? 1 : 0), PAL_NONE, x, y);
 	}
 
-	DrawCommonTileSeqInGUI(x, y, t, total_offset, 0, pal);
+	/* Default waypoint has no railtype specific sprites */
+	DrawCommonTileSeqInGUI(x, y, t, st == STATION_WAYPOINT ? 0 : total_offset, 0, pal);
 }
 
 static uint GetSlopeZ_Station(TileIndex tile, uint x, uint y)
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index b5a24bfa4b..56c0064408 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -2946,7 +2946,7 @@ int Train::UpdateSpeed()
 			this->max_speed = this->GetCurrentMaxSpeed();
 			accel = this->GetAcceleration();
 			break;
- 	}
+	}
 
 	uint spd = this->subspeed + accel;
 	this->subspeed = (byte)spd;