A method includes receiving a first data stream including first media content. The first data stream corresponds to a first channel. The method further includes detecting a channel change request from the first channel to a second channel. The method also includes storing user history data at a media device. The user history data indicates a portion of the first media content that had been received when the channel change request was detected. The method includes providing, to a display device, second media content of a received second data stream corresponding to the second channel. The method further includes, in response to detecting a second channel change request to return to the first channel, providing to a display device, the first media content of the first data stream beginning from a location of the first media content indicated by the user history data.