BS-11483
Fix offline