diff --git a/DbFirst.BlazorWebApp/Components/Layout/MainLayout.razor b/DbFirst.BlazorWebApp/Components/Layout/MainLayout.razor
index 77cd534..f7ce51c 100644
--- a/DbFirst.BlazorWebApp/Components/Layout/MainLayout.razor
+++ b/DbFirst.BlazorWebApp/Components/Layout/MainLayout.razor
@@ -50,13 +50,14 @@
         await ApplyDxDarkOverrideAsync();
     }
 
-    private async void OnThemeChanged()
+    private void OnThemeChanged()
     {
-        StateHasChanged();
-        if (_isInteractive)
+        InvokeAsync(async () =>
         {
-            await ApplyDxDarkOverrideAsync();
-        }
+            StateHasChanged();
+            if (_isInteractive)
+             await ApplyDxDarkOverrideAsync();
+        });
     }
 
     private async Task ApplyDxDarkOverrideAsync()
diff --git a/DbFirst.BlazorWebApp/Program.cs b/DbFirst.BlazorWebApp/Program.cs
index 1184383..a477173 100644
--- a/DbFirst.BlazorWebApp/Program.cs
+++ b/DbFirst.BlazorWebApp/Program.cs
@@ -44,4 +44,4 @@ app.UseAntiforgery();
 app.MapRazorComponents<App>()
     .AddInteractiveServerRenderMode();
 
-app.Run();
+app.Run();
\ No newline at end of file