diff --git a/CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBoxItem.razor.cs b/CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBoxItem.razor.cs
index 02f67adf..8a8a3ae8 100644
--- a/CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBoxItem.razor.cs
+++ b/CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBoxItem.razor.cs
@@ -24,8 +24,8 @@ public partial class MudComboBoxItem<T> : MudBaseSelectItem, IDisposable
             .Build();
 
         protected string HighlighterClassname => new CssBuilder()
-            .AddClass("mud-combobox-highlighter", string.IsNullOrEmpty(MudComboBox?.HighlightClass))
-            .AddClass(MudComboBox?.HighlightClass)
+            .AddClass("mud-combobox-highlighter", MudComboBox is not null && MudComboBox.Highlight && string.IsNullOrEmpty(MudComboBox.HighlightClass))
+            .AddClass(MudComboBox?.HighlightClass, MudComboBox is not null && MudComboBox.Highlight)
             .Build();
 
         internal string ItemId { get; } = string.Concat("_", Guid.NewGuid().ToString().AsSpan(0, 8));