By Tim Stack
March 09, 2012 at 06:08 PM EST


While Glee already paid homage to the late Whitney Houston in its Feb. 14 episode which coincidentally featured Amber Riley singing “I Will Always Love You,” EW has confirmed that the series will do an all-Houston episode once it returns from hiatus (E! Online first broke the news). Scheduled for its third episode back, our source says the hour will be different than the series’ previous odes to Michael Jackson and Madonna and much more a “lesson in how to say goodbye.”

Watch Riley cover “I Will Always Love You” below…

Follow Tim on Twitter: @EWTimStack

Read more:

Oprah Winfrey lands Whitney Houston family interview

Dionne Warwick’s final conversation with Whitney Houston: ‘She had everything in the world to live for.’

‘American Idol’: Jessica Sanchez covers Whitney Houston’s ‘I Will Always Love You’ — VIDEO