diff --git a/src/ModelContextProtocol/Configuration/McpServerOptionsSetup.cs b/src/ModelContextProtocol/Configuration/McpServerOptionsSetup.cs
index c2ebbf62..f1b91af3 100644
--- a/src/ModelContextProtocol/Configuration/McpServerOptionsSetup.cs
+++ b/src/ModelContextProtocol/Configuration/McpServerOptionsSetup.cs
@@ -27,11 +27,11 @@ public void Configure(McpServerOptions options)
         // if it otherwise lacks server information.
         if (options.ServerInfo is not { } serverInfo)
         {
-            var assemblyName = (Assembly.GetEntryAssembly() ?? Assembly.GetCallingAssembly()).GetName();
+            var assemblyName = Assembly.GetEntryAssembly()?.GetName();
             options.ServerInfo = new()
             {
-                Name = assemblyName.Name ?? "McpServer",
-                Version = assemblyName.Version?.ToString() ?? "1.0.0",
+                Name = assemblyName?.Name ?? "McpServer",
+                Version = assemblyName?.Version?.ToString() ?? "1.0.0",
             };
         }