diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index d2e07c7d15..4a33f9e296 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -205,16 +205,6 @@ namespace osu.Game.Overlays.Toolbar
 
             var realmKeyBinding = realmFactory.Context.All<RealmKeyBinding>().FirstOrDefault(rkb => rkb.RulesetID == null && rkb.ActionInt == (int)Hotkey.Value);
 
-            // TODO: temporarily disabled to avoid crashes when querying after ExecutionState is changed.
-            // if (realmKeyBinding != null)
-            // {
-            //     realmKeyBinding.PropertyChanged += (sender, args) =>
-            //     {
-            //         if (args.PropertyName == nameof(realmKeyBinding.KeyCombinationString))
-            //             updateKeyBindingTooltip();
-            //     };
-            // }
-
             if (realmKeyBinding != null)
             {
                 var keyBindingString = realmKeyBinding.KeyCombination.ReadableString();