diff --git a/web/react/components/msg_typing.jsx b/web/react/components/msg_typing.jsx
index 216cbc7f05..1bd23c55c3 100644
--- a/web/react/components/msg_typing.jsx
+++ b/web/react/components/msg_typing.jsx
@@ -37,8 +37,8 @@ export default class MsgTyping extends React.Component {
 
     onChange(msg) {
         if (msg.action === SocketEvents.TYPING &&
-            this.props.channelId === msg.channel_id &&
-            this.props.parentId === msg.props.parent_id) {
+                this.props.channelId === msg.channel_id &&
+                this.props.parentId === msg.props.parent_id) {
             this.lastTime = new Date().getTime();
 
             var username = 'Someone';
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index b2e9bc6a79..5eb8378ca9 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -56,7 +56,7 @@ module.exports = {
         NEW_USER: 'new_user',
         USER_ADDED: 'user_added',
         USER_REMOVED: 'user_removed',
-        TYPING: 'user_typing'
+        TYPING: 'typing'
     },
 
     SPECIAL_MENTIONS: ['all', 'channel'],