 
   cleanupCollaboration: (options = {}) ->
 
-    return  unless @stateMachine.state is 'Ending'
+    # TODO: remove Active session from here,
+    # we will deffo need a leaving state.
+    return  unless @stateMachine.state in ['Ending', 'Active']
 
     @rtm.once 'RealtimeManagerWillDispose', =>
       kd.utils.killRepeat @pingInterval



  onRealtimeParticipantLeft: (data) ->

    {sessionId} = data.collaborator



  onRealtimeParticipantJoined: (data) ->

    return  unless @stateMachine.state is 'Active'

    {sessionId} = data.collaborator

    {targetUser} =
