An extractor cleaning machine including a base or foot movable along a surface to be cleaned and a handle pivotally coupled to the foot for movement between an upright position and a reclined position. The handle includes a tank tray having an inlet and a drain. A channel communicates with the drain and extends away from the tank tray. A distributor communicates with the inlet and is operable to distribute cleaning fluid to the surface. A supply tank is removably coupled to the handle and has an outlet in fluid communication with the inlet when the supply tank is coupled to the handle. The supply tank is at least partially supported by the tank tray and the tank tray is configured to collect fluid spilt from the supply tank and to divert the fluid away from the tank tray by way of the channel.