[EXPLORER] Follow-up of #4718 (ba2cead)