Might be a good chance to have a look at your air filter. That would be the easiest thing - and of course do something that keeps your heater from starting on it's own during unlocking.

Good luck