diff --git a/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/EvaluateHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/EvaluateHandler.cs
index 4c93893bb..af056ccd2 100644
--- a/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/EvaluateHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/EvaluateHandler.cs
@@ -21,19 +21,19 @@ public EvaluateHandler(ILoggerFactory factory, PowerShellContextService powerShe
             _powerShellContextService = powerShellContextService;
         }
 
-        public async Task<EvaluateResponseBody> Handle(EvaluateRequestArguments request, CancellationToken cancellationToken)
+        public Task<EvaluateResponseBody> Handle(EvaluateRequestArguments request, CancellationToken cancellationToken)
         {
-            await _powerShellContextService.ExecuteScriptStringAsync(
+            _powerShellContextService.ExecuteScriptStringAsync(
                 request.Expression,
                 writeInputToHost: true,
                 writeOutputToHost: true,
-                addToHistory: true).ConfigureAwait(false);
+                addToHistory: true);
 
-            return new EvaluateResponseBody
+            return Task.FromResult(new EvaluateResponseBody
             {
                 Result = "",
                 VariablesReference = 0
-            };
+            });
         }
     }
 }