diff --git a/src/Presence.js b/src/Presence.js
index f798b1220d..c36bbdd8be 100644
--- a/src/Presence.js
+++ b/src/Presence.js
@@ -70,7 +70,7 @@ class Presence {
     }
 
     _onAction(payload) {
-        if (payload.action === 'user_activity_start') {
+        if (payload.action === 'user_activity') {
             this.setState("online");
             this._unavailableTimer.restart();
         }
diff --git a/src/UserActivity.js b/src/UserActivity.js
index b706821eac..4e3667274c 100644
--- a/src/UserActivity.js
+++ b/src/UserActivity.js
@@ -129,6 +129,7 @@ class UserActivity {
             this.lastScreenY = event.screenY;
         }
 
+        dis.dispatch({action: 'user_activity'});
         if (!this._activityTimeout.isRunning()) {
             this._activityTimeout.start();
             dis.dispatch({action: 'user_activity_start'});