diff --git a/src/core/client/stream/listeners/onPostMessageSetAuthToken.ts b/src/core/client/stream/listeners/onPostMessageSetAuthToken.ts
index 9321e0395..77be702ad 100644
--- a/src/core/client/stream/listeners/onPostMessageSetAuthToken.ts
+++ b/src/core/client/stream/listeners/onPostMessageSetAuthToken.ts
@@ -1,16 +1,13 @@
-import { commitLocalUpdate } from "react-relay";
-
 import { TalkContext } from "talk-framework/lib/bootstrap";
-import { LOCAL_ID } from "talk-framework/lib/relay";
+
+import { commit as setAuthToken } from "talk-framework/mutations/SetAuthTokenMutation";
 
 export default function onPostMessageSetAuthToken({
   relayEnvironment,
   postMessage,
 }: TalkContext) {
   // Auth popup will use this to handle a successful login.
-  postMessage!.on("setAuthToken", token => {
-    commitLocalUpdate(relayEnvironment, s => {
-      s.get(LOCAL_ID)!.setValue(token, "authToken");
-    });
+  postMessage!.on("setAuthToken", (authToken: string) => {
+    setAuthToken(relayEnvironment, { authToken });
   });
 }