IM-1572: Fixes the issue for non upgraded sites