Fixes: [38248] Fix regression causing black screen on startup