Fix retrieval of default tenant when tenantId string is empty