diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/CompletionHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/CompletionHandler.cs
index 104c6bcb6..654f8a92e 100644
--- a/src/PowerShellEditorServices/Services/TextDocument/Handlers/CompletionHandler.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/CompletionHandler.cs
@@ -95,6 +95,12 @@ public bool CanResolve(CompletionItem value)
         // Handler for "completionItem/resolve". In VSCode this is fired when a completion item is highlighted in the completion list.
         public async Task<CompletionItem> Handle(CompletionItem request, CancellationToken cancellationToken)
         {
+            // We currently only support this request for anything that returns a CommandInfo: functions, cmdlets, aliases.
+            if (request.Kind != CompletionItemKind.Function)
+            {
+                return request;
+            }
+
             // Get the documentation for the function
             CommandInfo commandInfo =
                 await CommandHelpers.GetCommandInfoAsync(