diff --git a/.gitignore b/.gitignore
index b51d843..45d0743 100644
--- a/.gitignore
+++ b/.gitignore
@@ -355,3 +355,4 @@ Client/Properties/ServiceDependencies/TryMudBlazor - Web Deploy/
 # Rider idea folder
 .idea/
 *.DS_Store
+/src/TryMudBlazor.Server/wwwroot/client
diff --git a/src/TryMudBlazor.Server/Program.cs b/src/TryMudBlazor.Server/Program.cs
index 0aaf1a3..8e9191e 100644
--- a/src/TryMudBlazor.Server/Program.cs
+++ b/src/TryMudBlazor.Server/Program.cs
@@ -44,7 +44,7 @@ public static void Main(string[] args)
 
         var version = GetVersion();
         var cacheBusting = $"v{version.Major}.{version.Minor}.{version.Build}";
-        app.MapFallbackToFile("index.html")
+        app.MapFallbackToFile("client/index.html")
             .CacheOutput(policy => policy.SetVaryByQuery("cachebust", cacheBusting));
 
         app.Run();
diff --git a/src/TryMudBlazor.Server/TryMudBlazor.Server.csproj b/src/TryMudBlazor.Server/TryMudBlazor.Server.csproj
index 8e14c14..d58a046 100644
--- a/src/TryMudBlazor.Server/TryMudBlazor.Server.csproj
+++ b/src/TryMudBlazor.Server/TryMudBlazor.Server.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <Nullable>enable</Nullable>
@@ -19,4 +19,16 @@
     <ProjectReference Include="..\MudBlazor.Examples.Data\MudBlazor.Examples.Data.csproj" />
   </ItemGroup>
 
+    <!-- Copy the wwwroot output from TryMudBlazor.Client into this project's wwwroot/client directory -->
+    <ItemGroup>
+        <ClientWwwRootFiles Include="..\TryMudBlazor.Client\wwwroot\**\*" />
+    </ItemGroup>
+
+    <Target Name="CopyClientWwwRoot" AfterTargets="Build">
+        <Copy
+          SourceFiles="@(ClientWwwRootFiles)"
+          DestinationFiles="@(ClientWwwRootFiles->'$(ProjectDir)wwwroot\client\%(RecursiveDir)%(Filename)%(Extension)')"
+          SkipUnchangedFiles="true" />
+    </Target>    
+    
 </Project>