@aboudreault Can you check if this change wouldn't create issues with multiple videos? A general review of this PR from you would be helpful too, as you know this XBlock well. Thanks!