Fixes #5035: Adapt initial promises to only check components when present