     query: page: 1
 
   componentWillReceiveProps: (nextProps) ->
-    unless nextProps.query.page is @props.query.page
+    if @props.params.discussion isnt nextProps.params.discussion
+      @setDiscussion(nextProps.params.discussion)
+        .then => @setComments(nextProps.query.page ? 1)
+    else if nextProps.query.page isnt @props.query.page
       @setComments(nextProps.query.page ? 1)
 
   componentDidMount: ->

  scrollToBottomOfDiscussion: ->
    React.findDOMNode(@)?.scrollIntoView(false)

  setDiscussion: ->
    @discussionsRequest()
      .then (discussion) =>
        @setState {discussion: discussion[0]}


  commentsRequest: (page) ->
    {board, discussion} = @props.params
    talkClient.type('comments').get({discussion_id: discussion, page_size: PAGE_SIZE, page})

  setComments: (page = @props.query?.page) ->
    @commentsRequest(page)
