diff --git a/src/scripts/site.js b/src/scripts/site.js
index 04f19c9d0..543486fae 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -169,8 +169,11 @@ function initSyncPlay() {
 
     // Start SyncPlay.
     const apiClient = ServerConnections.currentApiClient();
-    SyncPlay.Manager.init(apiClient);
+    if (apiClient) SyncPlay.Manager.init(apiClient);
     SyncPlayToasts.init();
+
+    // FIXME: Multiple apiClients?
+    Events.on(ServerConnections, 'apiclientcreated', (e, newApiClient) => SyncPlay.Manager.init(newApiClient));
 }
 
 function onAppReady() {