diff --git a/Content.Client/_Sunrise/TapePlayer/TapePlayerBoundUserInterface.cs b/Content.Client/_Sunrise/TapePlayer/TapePlayerBoundUserInterface.cs
index a0aec15c7a..2cc6d9fd95 100644
--- a/Content.Client/_Sunrise/TapePlayer/TapePlayerBoundUserInterface.cs
+++ b/Content.Client/_Sunrise/TapePlayer/TapePlayerBoundUserInterface.cs
@@ -61,7 +61,7 @@ public sealed class TapePlayerBoundUserInterface : BoundUserInterface
         if (_entityManager.TryGetComponent<MusicTapeComponent>(tapePlayer.InsertedTape, out var musicTapeComponent))
         {
             var audio = EntMan.System<AudioSystem>();
-            var length = audio.GetAudioLength(audio.GetSound(musicTapeComponent.Sound));
+            var length = audio.GetAudioLength(audio.ResolveSound(musicTapeComponent.Sound));
             _menu.SetSelectedSong(musicTapeComponent.SongName, (float) length.TotalSeconds);
         }
         else
@@ -104,7 +104,7 @@ public sealed class TapePlayerBoundUserInterface : BoundUserInterface
             return;
 
         _menu.OnClose -= Close;
-        _menu.Dispose();
+        _menu.Orphan();
         _menu = null;
     }
 }
diff --git a/Content.Client/_Sunrise/TapePlayer/TapePlayerSystem.cs b/Content.Client/_Sunrise/TapePlayer/TapePlayerSystem.cs
index 9454b70b88..9d93424bd7 100644
--- a/Content.Client/_Sunrise/TapePlayer/TapePlayerSystem.cs
+++ b/Content.Client/_Sunrise/TapePlayer/TapePlayerSystem.cs
@@ -46,6 +46,9 @@ namespace Content.Client._Sunrise.TapePlayer
 
         private void OnTapePlayerAfterState(Entity<TapePlayerComponent> ent, ref AfterAutoHandleStateEvent args)
         {
+            if (IsClientSide(ent))
+                return;
+
             if (!_uiSystem.TryGetOpenUi<TapePlayerBoundUserInterface>(ent.Owner, TapePlayerUiKey.Key, out var bui))
                 return;
 
diff --git a/Content.Shared/_Sunrise/TapePlayer/MusicTapeComponent.cs b/Content.Shared/_Sunrise/TapePlayer/MusicTapeComponent.cs
index acbe1f5c7c..159b19176d 100644
--- a/Content.Shared/_Sunrise/TapePlayer/MusicTapeComponent.cs
+++ b/Content.Shared/_Sunrise/TapePlayer/MusicTapeComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Shared._Sunrise.TapePlayer
     [RegisterComponent, NetworkedComponent]
     public sealed partial class MusicTapeComponent : Component
     {
-        [DataField(customTypeSerializer: typeof(SoundSpecifierTypeSerializer), required: true)]
+        [DataField(required: true)]
         public SoundSpecifier Sound;
 
         [DataField]