diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index cb170ad298..2367651e04 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -13,6 +13,7 @@ using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Replays.Legacy;
@@ -122,19 +123,26 @@ namespace osu.Game.Online.Spectator
                 isConnected = false;
                 playingUsers.Clear();
 
-                if (ex != null) await tryUntilConnected();
+                if (ex != null)
+                {
+                    Logger.Log($"Spectator client lost connection: {ex}", LoggingTarget.Network);
+                    await tryUntilConnected();
+                }
             };
 
             await tryUntilConnected();
 
             async Task tryUntilConnected()
             {
+                Logger.Log("Spectator client connecting...", LoggingTarget.Network);
+
                 while (api.State.Value == APIState.Online)
                 {
                     try
                     {
                         // reconnect on any failure
                         await connection.StartAsync();
+                        Logger.Log("Spectator client connected!", LoggingTarget.Network);
 
                         // success
                         isConnected = true;
@@ -151,8 +159,9 @@ namespace osu.Game.Online.Spectator
 
                         break;
                     }
-                    catch
+                    catch (Exception e)
                     {
+                        Logger.Log($"Spectator client connection error: {e}", LoggingTarget.Network);
                         await Task.Delay(5000);
                     }
                 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index e346630235..c2441b31a9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -419,11 +419,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
             };
 
             // bring in updates from selection changes
-            EditorBeatmap.HitObjectUpdated += _ => UpdateTernaryStates();
+            EditorBeatmap.HitObjectUpdated += _ => Scheduler.AddOnce(UpdateTernaryStates);
             EditorBeatmap.SelectedHitObjects.CollectionChanged += (sender, args) =>
             {
                 Scheduler.AddOnce(updateVisibility);
-                UpdateTernaryStates();
+                Scheduler.AddOnce(UpdateTernaryStates);
             };
         }