For ENG-5962, fix double registration of mailbox