A method and control module for controlling an engine includes a lift command module that commands a first lift state after detecting an engine shut-down signal and a shut-down delay determination module that determines a shut-down delay period, that continues spark and fuel control before the shut-down delay period and that ends spark and fuel control to shut down the engine after the shut-down delay period.