diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index 1b552838a6..8c49315e76 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -202,8 +202,7 @@ class CreateComment extends React.Component {
         if (e.keyCode === KeyCodes.UP && this.state.messageText === '') {
             e.preventDefault();
 
-            const channelId = ChannelStore.getCurrentId();
-            const lastPost = PostStore.getCurrentUsersLatestPost(channelId, this.props.rootId);
+            const lastPost = PostStore.getCurrentUsersLatestPost(this.props.channelId, this.props.rootId);
             if (!lastPost) {
                 return;
             }
@@ -402,4 +401,4 @@ CreateComment.propTypes = {
     rootId: React.PropTypes.string.isRequired
 };
 
-export default injectIntl(CreateComment);
\ No newline at end of file
+export default injectIntl(CreateComment);