diff --git a/app/websocket_router.go b/app/websocket_router.go
index 80cc0e7980..0aab6d2dc7 100644
--- a/app/websocket_router.go
+++ b/app/websocket_router.go
@@ -54,17 +54,17 @@ func (wr *WebSocketRouter) ServeWebSocket(conn *WebConn, r *model.WebSocketReque
 			return
 		}
 
-		wr.app.Srv().Go(func() {
-			wr.app.SetStatusOnline(session.UserId, false)
-			wr.app.UpdateLastActivityAtIfNeeded(*session)
-		})
-
 		conn.SetSession(session)
 		conn.SetSessionToken(session.Token)
 		conn.UserId = session.UserId
 
 		wr.app.HubRegister(conn)
 
+		wr.app.Srv().Go(func() {
+			wr.app.SetStatusOnline(session.UserId, false)
+			wr.app.UpdateLastActivityAtIfNeeded(*session)
+		})
+
 		resp := model.NewWebSocketResponse(model.STATUS_OK, r.Seq, nil)
 		hub := wr.app.GetHubForUserId(conn.UserId)
 		if hub == nil {