Fixed incoherent behaviour between JS enabled/disabled rendering