Resolved a potential problem storing tenant id