Abstract: In one embodiment, a light-emitting device having a reflector cup, a light source die, a wavelength-converting layer, an optical structure, and an encapsulant is disclosed. The wavelength-converting layer may be configured to convert a narrow band light emitted from the light source die into a broad band light before the light is directed towards a first direction. The optical element may be an air ring embedded within the encapsulant and may be arranged circumscribing the wavelength-converting layer. In another embodiment, a light-emitting device with extended wavelength-converting layer in place of the air ring is presented.