diff --git a/Directory.Packages.props b/Directory.Packages.props
index 64d72e4b24d..06a8e1d77f5 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -88,8 +88,8 @@
     <PackageVersion Include="KubernetesClient" Version="16.0.7" />
     <PackageVersion Include="JsonPatch.Net" Version="3.3.0" />
     <PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.2" />
-    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.11.6" />
-    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.11.6" />
+    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.11.9" />
+    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.11.9" />
     <PackageVersion Include="Milvus.Client" Version="2.3.0-preview.1" />
     <PackageVersion Include="MongoDB.Driver" Version="3.4.0" />
     <PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="2.0.0" />
diff --git a/src/Aspire.Dashboard/Components/Controls/FixedFluentCombobox.razor b/src/Aspire.Dashboard/Components/Controls/FixedFluentCombobox.razor
deleted file mode 100644
index 7af1fa97be9..00000000000
--- a/src/Aspire.Dashboard/Components/Controls/FixedFluentCombobox.razor
+++ /dev/null
@@ -1,8 +0,0 @@
-@namespace Aspire.Dashboard.Components
-@inherits FluentCombobox<TOption>
-@typeparam TOption
-
-@{
-    /* Write the base component content here */
-    base.BuildRenderTree(__builder);
-}
diff --git a/src/Aspire.Dashboard/Components/Controls/FixedFluentCombobox.razor.cs b/src/Aspire.Dashboard/Components/Controls/FixedFluentCombobox.razor.cs
deleted file mode 100644
index 2d464b9b202..00000000000
--- a/src/Aspire.Dashboard/Components/Controls/FixedFluentCombobox.razor.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.AspNetCore.Components;
-using Microsoft.FluentUI.AspNetCore.Components;
-
-namespace Aspire.Dashboard.Components;
-
-// TODO: This is a temporary fix for https://github.com/dotnet/aspire/issues/8343 and https://github.com/microsoft/fluentui-blazor/issues/3600
-// Remove once FluentUI is fixed and dashboard is using the fixed version.
-[CascadingTypeParameter(nameof(TOption))]
-public partial class FixedFluentCombobox<TOption> : FluentCombobox<TOption> where TOption : notnull
-{
-    protected override async Task ChangeHandlerAsync(ChangeEventArgs e)
-    {
-        await InvokeAsync(async () => await base.ChangeHandlerAsync(e));
-    }
-}
diff --git a/src/Aspire.Dashboard/Components/Dialogs/FilterDialog.razor b/src/Aspire.Dashboard/Components/Dialogs/FilterDialog.razor
index b01aa005cab..f7b921482c2 100644
--- a/src/Aspire.Dashboard/Components/Dialogs/FilterDialog.razor
+++ b/src/Aspire.Dashboard/Components/Dialogs/FilterDialog.razor
@@ -33,7 +33,7 @@
         </div>
 
         <div class="filter-input-container">
-            <FixedFluentCombobox TOption="SelectViewModel<FieldValue>"
+            <FluentCombobox TOption="SelectViewModel<FieldValue>"
                             @bind-Value="_formModel.Value"
                             @bind-Value:after="ValueChanged"
                             Items="@_filteredValues"
@@ -53,7 +53,7 @@
                     </FluentBadge>
                     <FluentHighlighter Text="@optionContext.Name" HighlightedText="@_formModel.Value" />
                 </OptionTemplate>
-            </FixedFluentCombobox>
+            </FluentCombobox>
             <ValidationMessage For="() => _formModel.Value" />
         </div>
 
diff --git a/src/Aspire.Dashboard/Model/IconResolver.cs b/src/Aspire.Dashboard/Model/IconResolver.cs
index 5f1733ce1c7..6f9289f980d 100644
--- a/src/Aspire.Dashboard/Model/IconResolver.cs
+++ b/src/Aspire.Dashboard/Model/IconResolver.cs
@@ -44,21 +44,13 @@ private sealed record IconKey(string IconName, IconSize DesiredIconSize, IconVar
 
     private static bool TryGetIcon(IconKey key, IconSize size, [NotNullWhen(true)] out CustomIcon? icon)
     {
-        try
+        var iconInfo = new IconInfo
         {
-            icon = (new IconInfo
-            {
-                Name = key.IconName,
-                Variant = key.IconVariant,
-                Size = size
-            }).GetInstance();
-            return true;
-        }
-        catch
-        {
-            // Icon name or size couldn't be found.
-            icon = null;
-            return false;
-        }
+            Name = key.IconName,
+            Variant = key.IconVariant,
+            Size = size
+        };
+
+        return iconInfo.TryGetInstance(out icon);
     }
 }
diff --git a/tests/Aspire.Dashboard.Components.Tests/Pages/ConsoleLogsTests.cs b/tests/Aspire.Dashboard.Components.Tests/Pages/ConsoleLogsTests.cs
index c28d481786d..40e487c15a7 100644
--- a/tests/Aspire.Dashboard.Components.Tests/Pages/ConsoleLogsTests.cs
+++ b/tests/Aspire.Dashboard.Components.Tests/Pages/ConsoleLogsTests.cs
@@ -559,6 +559,7 @@ private void SetupConsoleLogsServices(TestDashboardClient? dashboardClient = nul
         Services.AddSingleton<BrowserTimeProvider>(timeProvider ?? new TestTimeProvider());
         Services.AddSingleton<IMessageService, MessageService>();
         Services.AddSingleton<IToastService, ToastService>();
+        Services.AddSingleton<GlobalState>();
         Services.AddSingleton<IOptions<DashboardOptions>>(Options.Create(new DashboardOptions()));
         Services.AddSingleton<DimensionManager>();
         Services.AddSingleton<TelemetryRepository>();