A handheld extraction cleaner system includes a wet cleaning head including a wet suction nozzle, a dry cleaning head including a dry suction nozzle. A handheld base includes a modular receiver configured to interchangeably couple to the wet cleaning head and the dry cleaning head. A suction source is configured to generate a suction air stream through the wet suction nozzle when the wet cleaning head is coupled to the modular receiver and through the dry suction nozzle when the dry cleaning head is coupled to the modular receiver. A fluid delivery system includes a fluid distributor configured to dispense a cleaning solution on a surface to be cleaned, where at least one of the handheld base and the dry cleaning head is configured to at least partially prevent the fluid delivery system from dispensing the cleaning solution when the dry cleaning head is coupled to the modular receiver.