diff --git a/assets/js/services/channel.js b/assets/js/services/channel.js
index 8119d62..66774e3 100644
--- a/assets/js/services/channel.js
+++ b/assets/js/services/channel.js
@@ -1,6 +1,6 @@
 import _ from "lodash";
 import socket from "./socket";
-import Presences from "./presences";
+import { Presence } from "phoenix";
 import {
   setUserId,
   setPlayers,
@@ -13,7 +13,7 @@ class Channel {
   constructor(store, gameId) {
     this.store = store;
     this.channel = socket.channel(`game:${gameId}`, {});
-    this.presences = new Presences();
+    this.presence = new Presence(this.channel);
 
     this.join();
     this.subscribe();
@@ -38,15 +38,9 @@ class Channel {
   subscribe() {
     this.channel.on("game:update", this.updateGame.bind(this));
 
-    this.channel.on("presence_state", data => {
-      this.presences.syncState(data);
+    this.presence.onSync(() => {
       this.setOpponentStatus();
-    });
-
-    this.channel.on("presence_diff", data => {
-      this.presences.syncDiff(data);
-      this.setOpponentStatus();
-    });
+    })
   }
 
   updateGame(data) {
@@ -60,11 +54,20 @@ class Channel {
   setOpponentStatus() {
     this.store.dispatch(
       setOpponentStatus(
-        this.presences.opponentOnline(this.opponentId) ? "viewing" : "offline"
+        this.opponentOnline(this.opponentId) ? "viewing" : "offline"
       )
     );
   }
 
+  opponentOnline(opponentId) {
+    return _.find(
+      this.presence.list(),
+      ({ metas: [user, ...rest] }, id) => {
+        return parseInt(user.id) == opponentId;
+      }
+    );
+  }
+
   getAvailableMoves(square) {
     this.channel
       .push("game:get_available_moves", { square })
diff --git a/lib/chess_web/channels/game_channel.ex b/lib/chess_web/channels/game_channel.ex
index 1c5f431..ae51885 100644
--- a/lib/chess_web/channels/game_channel.ex
+++ b/lib/chess_web/channels/game_channel.ex
@@ -106,7 +106,7 @@ defmodule ChessWeb.GameChannel do
 
   def track_presence(socket) do
     {:ok, _} = Presence.track(socket, socket.assigns.user_id, %{
-      user_id: socket.assigns.user_id,
+      id: socket.assigns.user_id,
       online_at: inspect(System.system_time(:seconds))
     })