Yes, the machine comes with auto shut-off technology. After the set time is finished, the machine shuts off.