diff --git a/src/TailBlazor.Tabs/ITab.cs b/src/TailBlazor.Tabs/ITab.cs
index 98d3182..4fd430c 100644
--- a/src/TailBlazor.Tabs/ITab.cs
+++ b/src/TailBlazor.Tabs/ITab.cs
@@ -1,17 +1,15 @@
-using System;
 using Microsoft.AspNetCore.Components;
 
-namespace TailBlazor.Tabs
+namespace TailBlazor.Tabs;
+
+public interface ITab
 {
-    public interface ITab
-    {
-        RenderFragment ChildContent { get; }
-        RenderFragment TitleContent { get; }
-        RenderFragment TabContent { get; }
-        int Id { get; }
-        string Title { get; }
-        string ActiveClass { get; set; }
-        string Class { get; set; }
-        void Activate();
-    }
+    RenderFragment? ChildContent { get; }
+    RenderFragment? TitleContent { get; }
+    RenderFragment? TabContent { get; }
+    int Id { get; }
+    string? Title { get; }
+    string? ActiveClass { get; set; }
+    string? Class { get; set; }
+    void Activate();
 }
\ No newline at end of file
diff --git a/src/TailBlazor.Tabs/TailBlazor.Tabs.csproj b/src/TailBlazor.Tabs/TailBlazor.Tabs.csproj
index 7689d8c..4422df3 100644
--- a/src/TailBlazor.Tabs/TailBlazor.Tabs.csproj
+++ b/src/TailBlazor.Tabs/TailBlazor.Tabs.csproj
@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-    <PackageId>TailBlazor.Tabs</PackageId>
-    <RootNamespace>TailBlazor.Tabs</RootNamespace>
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <PackageId>TailBlazor.Tabs</PackageId>
+    <RootNamespace>TailBlazor.Tabs</RootNamespace>
     <Version>1.1.5</Version>
     <Authors>Taylor Watson</Authors>
     <IsPackage>true</IsPackage>
@@ -24,13 +24,9 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
-  <ItemGroup>
-    <SupportedPlatform Include="browser" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.1" />
-  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
+  </ItemGroup>
 
   <ItemGroup>
     <None Include="../../logo.png" Pack="true" PackagePath="">
diff --git a/src/TailBlazor.Tabs/TailBlazorTab.razor b/src/TailBlazor.Tabs/TailBlazorTab.razor
index 3b8bd1b..921409d 100644
--- a/src/TailBlazor.Tabs/TailBlazorTab.razor
+++ b/src/TailBlazor.Tabs/TailBlazorTab.razor
@@ -1,7 +1,7 @@
 @namespace TailBlazor.Tabs
 @implements ITab
 
-<span @onclick="@Activate" aria-label="@(AriaLabel)" @onclick:preventDefault
+<span @onclick="ActivateAsync" aria-label="@AriaLabel" @onclick:preventDefault="true"
     class="@(ContainerTabs.ActiveTab == this ? ActiveClass : Class)">
     @if (TitleContent != null) {
         @TitleContent
@@ -10,31 +10,27 @@
     }
 </span>
 
+@code {
 
-@functions {
-
-    [CascadingParameter] public TailBlazorTabs ContainerTabs { get; set; }
-    [Parameter] public string ActiveClass { get; set; }
-    [Parameter] public string Class { get; set; }
-    [Parameter] public string Title { get; set; }
-    [Parameter] public string AriaLabel { get; set; }
-    [Parameter] public RenderFragment ChildContent { get; set; }
-    [Parameter] public RenderFragment TitleContent { get; set; }
-    [Parameter] public RenderFragment TabContent { get; set; }
+    [CascadingParameter] public TailBlazorTabs ContainerTabs { get; set; } = default!;
+    [Parameter] public string? ActiveClass { get; set; }
+    [Parameter] public string? Class { get; set; }
+    [Parameter] public string? Title { get; set; }
+    [Parameter] public string? AriaLabel { get; set; }
+    [Parameter] public RenderFragment? ChildContent { get; set; }
+    [Parameter] public RenderFragment? TitleContent { get; set; }
+    [Parameter] public RenderFragment? TabContent { get; set; }
     [Parameter] public EventCallback<ITab> OnClickCallback { get; set; }
 
     public int Id { get; private set; }
-        
+
     protected override void OnInitialized()
     {
-        if (String.IsNullOrEmpty(Class))
-            Class = ContainerTabs.DefaultTabClass;    
-        if (String.IsNullOrEmpty(ActiveClass))
-            ActiveClass = ContainerTabs.DefaultTabActiveClass;
-        if (String.IsNullOrEmpty(AriaLabel))
-            AriaLabel = Title;
-
-        Id = ContainerTabs.Tabs.Count();
+        Class ??= ContainerTabs.DefaultTabClass;
+        ActiveClass ??= ContainerTabs.DefaultTabActiveClass;
+        AriaLabel ??= Title ?? string.Empty;
+
+        Id = ContainerTabs.Tabs.Count;
         // make sure at least one tab is active
         ContainerTabs.AddTab(this);
     }
@@ -42,7 +38,22 @@
     public void Activate()
     {
         ContainerTabs.SetActivateTab(this);
-        OnClickCallback.InvokeAsync(this.ContainerTabs.ActiveTab);
-        StateHasChanged();
+        _ = NotifyActivationAsync();
+    }
+
+    private async Task ActivateAsync()
+    {
+        ContainerTabs.SetActivateTab(this);
+        await NotifyActivationAsync();
+    }
+
+    private async Task NotifyActivationAsync()
+    {
+        if (OnClickCallback.HasDelegate)
+        {
+            await OnClickCallback.InvokeAsync(ContainerTabs.ActiveTab);
+        }
+
+        await InvokeAsync(StateHasChanged);
     }
 }
\ No newline at end of file
diff --git a/src/TailBlazor.Tabs/TailBlazorTabs.razor b/src/TailBlazor.Tabs/TailBlazorTabs.razor
index ea66a5c..ab3d84c 100644
--- a/src/TailBlazor.Tabs/TailBlazorTabs.razor
+++ b/src/TailBlazor.Tabs/TailBlazorTabs.razor
@@ -1,26 +1,26 @@
 @namespace TailBlazor.Tabs
 
-<CascadingValue Value=this>
-    <div class="@(NavWrapperClass)">
-        <nav class="@Class" aria-label="@(AriaLabel)">
+<CascadingValue Value="this">
+    <div class="@NavWrapperClass">
+        <nav class="@Class" aria-label="@AriaLabel">
             @ChildContent
         </nav>
     </div>
 </CascadingValue>
 
-<div class="@(TabsWrapperClass)">
+<div class="@TabsWrapperClass">
     @(ActiveTab?.TabContent ?? ActiveTab?.ChildContent)
 </div>
 
 @code {
 
-    [Parameter] public RenderFragment ChildContent { get; set; }
-    [Parameter] public string NavWrapperClass { get; set; }
-    [Parameter] public string TabsWrapperClass { get; set; }
+    [Parameter] public RenderFragment? ChildContent { get; set; }
+    [Parameter] public string? NavWrapperClass { get; set; } = string.Empty;
+    [Parameter] public string? TabsWrapperClass { get; set; } = string.Empty;
     [Parameter] public string Class { get; set; } = "flex space-x-8 w-full";
     [Parameter] public string AriaLabel { get; set; } = "Tabs";
     [Parameter] public EventCallback<ITab> OnClickCallback { get; set; }
-    [Parameter] public EventCallback<int> SelectedTabChanged { get; set; } 
+    [Parameter] public EventCallback<int> SelectedTabChanged { get; set; }
     [Parameter] public string DefaultTabClass { get; set; } = "px-3 py-2 font-medium text-sm rounded-md cursor-pointer text-gray-500 hover:text-gray-700";
     [Parameter] public string DefaultTabActiveClass { get; set; } = "px-3 py-2 font-medium text-sm rounded-md cursor-pointer bg-gray-300 text-gray-700";
     [Parameter] public int SelectedTab { 
@@ -38,17 +38,17 @@
         }
     }
 
-    private int _selectedTabId;
-    public ITab ActiveTab { get; private set; }
-    public List<ITab> Tabs { get; private set; } = new List<ITab>();
+    private int _selectedTabId = -1;
+    public ITab? ActiveTab { get; private set; }
+    public List<ITab> Tabs { get; } = new();
 
     public void AddTab(ITab tab)
     {
+        Tabs.Add(tab);
         if (ActiveTab == null)
         {
             SetActivateTab(tab);
         }
-        Tabs.Add(tab);
     }
 
     public void RemoveTab(ITab tab)
@@ -60,25 +60,45 @@
         Tabs.Remove(tab);
     }
 
-    public void SetActivateTab(ITab tab, bool forceTabActivate = false)
+    public void SetActivateTab(ITab? tab, bool forceTabActivate = false)
     {
+        if (tab is null)
+        {
+            if (ActiveTab is null)
+            {
+                return;
+            }
 
-        if (ActiveTab == tab) return;
-        ActiveTab = tab;
-        SelectedTab = tab.Id;
-        try
+            ActiveTab = null;
+            _selectedTabId = -1;
+            InvokeAsync(StateHasChanged);
+            return;
+        }
+
+        if (ActiveTab == tab && !forceTabActivate)
         {
+            return;
+        }
 
-            if (forceTabActivate)
-                ActiveTab.Activate();
+        var selectionChanged = _selectedTabId != tab.Id;
+        ActiveTab = tab;
+        _selectedTabId = tab.Id;
 
-            OnClickCallback.InvokeAsync(tab);
-            // Cannot process pending renders after the renderer has been disposed? try/catch hides this but gotta fix
-            InvokeAsync(() => { StateHasChanged(); });
+        if (selectionChanged && SelectedTabChanged.HasDelegate)
+        {
+            _ = SelectedTabChanged.InvokeAsync(tab.Id);
         }
-        catch (Exception exception)
+
+        if (forceTabActivate)
         {
-            Console.WriteLine(exception.Message);
+            tab.Activate();
         }
+
+        if (OnClickCallback.HasDelegate)
+        {
+            _ = OnClickCallback.InvokeAsync(tab);
+        }
+
+        InvokeAsync(StateHasChanged);
     }
 }
\ No newline at end of file
diff --git a/src/TailBlazor.Tabs/_Imports.razor b/src/TailBlazor.Tabs/_Imports.razor
index ba6bbe2..523fe0f 100644
--- a/src/TailBlazor.Tabs/_Imports.razor
+++ b/src/TailBlazor.Tabs/_Imports.razor
@@ -1 +1,3 @@
-@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Web
+@using System.Linq
+@using System.Threading.Tasks