diff --git a/src/CSharpLanguageServer/Server.fs b/src/CSharpLanguageServer/Server.fs
index 2ccaf1f0..0fe75b5a 100644
--- a/src/CSharpLanguageServer/Server.fs
+++ b/src/CSharpLanguageServer/Server.fs
@@ -330,7 +330,11 @@ let setupServerHandlers settings (lspClient: LspClient) =
 
                       match csharpSettingsMaybe with
                       | Some csharpSettings ->
-                          Some { scope.State.Settings with SolutionPath = csharpSettings.solution }
+
+                          match csharpSettings.solution with
+                          | Some solutionPath-> Some { scope.State.Settings with SolutionPath = Some solutionPath }
+                          | _ -> None
+
                       | _ -> None
                   | _ -> None