+ [OE-3413] - ensure firm switching when editing/created events is handled gracefully