From 56b2386870f10dba1a12f382376a630af2ae7826 Mon Sep 17 00:00:00 2001
From: eoineoineoin <github@eoinrul.es>
Date: Fri, 12 May 2023 23:07:04 +0100
Subject: [PATCH] Fix bug where space music would play even when on station
 (#16260)

---
 Content.Client/Audio/BackgroundAudioSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Client/Audio/BackgroundAudioSystem.cs b/Content.Client/Audio/BackgroundAudioSystem.cs
index 034ed16665..50639a6d05 100644
--- a/Content.Client/Audio/BackgroundAudioSystem.cs
+++ b/Content.Client/Audio/BackgroundAudioSystem.cs
@@ -130,7 +130,7 @@ public sealed class BackgroundAudioSystem : EntitySystem
     {
         if (_playMan.LocalPlayer is null
             || _playMan.LocalPlayer.ControlledEntity != message.Entity
-            || !_timing.IsFirstTimePredicted)
+            || !(_timing.IsFirstTimePredicted || _timing.ApplyingState))
             return;
 
         // Check if we traversed to grid.
-- 
2.51.2