NXP-12263: avoid safeEdit infinit wait