diff --git a/client/layouts/default.vue b/client/layouts/default.vue
index 8b2eea53..0db01842 100644
--- a/client/layouts/default.vue
+++ b/client/layouts/default.vue
@@ -110,13 +110,7 @@ export default {
       }
       console.log('Init Payload', payload)
       if (payload.session) {
-        if (this.$refs.streamContainer) {
-          this.$refs.streamContainer.sessionOpen(payload.session)
-        } else {
-          console.warn('Stream Container not mounted')
-        }
-      }
-      if (payload.serverSettings) {
+        this.$refs.streamContainer.sessionOpen(payload.session)
       }
 
       // Start scans currently running
diff --git a/client/players/PlayerHandler.js b/client/players/PlayerHandler.js
index aa2c5346..8dadc22b 100644
--- a/client/players/PlayerHandler.js
+++ b/client/players/PlayerHandler.js
@@ -177,12 +177,13 @@ export default class PlayerHandler {
   }
 
   prepareOpenSession(session, playbackRate) { // Session opened on init socket
+    if (!this.player) this.switchPlayer() // Must set player first for open sessions
+
     this.libraryItem = session.libraryItem
     this.isVideo = session.libraryItem.mediaType === 'video'
     this.playWhenReady = false
     this.initialPlaybackRate = playbackRate
 
-    if (!this.player) this.switchPlayer()
     this.prepareSession(session)
   }
 
diff --git a/server/Server.js b/server/Server.js
index 44a28d6d..c4407c4c 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -140,7 +140,7 @@ class Server {
     await this.purgeMetadata() // Remove metadata folders without library item
     await this.cacheManager.ensureCachePaths()
     await this.abMergeManager.ensureDownloadDirPath()
-    
+
     await this.backupManager.init()
     await this.logManager.init()
     await this.rssFeedManager.init()
@@ -451,6 +451,7 @@ class Server {
     } else {
       Logger.debug(`[Server] User Online ${client.user.username}`)
     }
+
     this.io.emit('user_online', client.user.toJSONForPublic(this.playbackSessionManager.sessions, this.db.libraryItems))
 
     user.lastSeen = Date.now()