A system and method for ensuring an improved transition at the application layer when distribution of media is changed from broadcast/multicast bearers to unicast bearers and vice versa. A mapping is defined between the timeline of a Packet-Switched Streaming Service (PSS) session and the Multimedia Broadcast Multicast Service (MBMS) session timeline. This mapping is used to enable the correct positioning of the stream in a PSS session by a PSS server after a handover has occurred. Broadcast multicast service center (BM-SC) signals can support various options for media playback after a MBMS-PSS handover in a PSS session description protocol (SDP) file or in the MBMS user service description (USD). In response, the client can signal its choice in the RTSP request that is sent when switching to the PSS session.