diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs
index e2c8ea5f..4f731972 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs
@@ -381,7 +381,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
                     {
                         if (definitionResult.IsErrorResult)
                         {
-                            await requestContext.SendError(definitionResult.Message);
+                            await requestContext.SendError(definitionResult.Message);                            
                         }
                         else
                         {
@@ -391,12 +391,17 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
                     }
                     else
                     {
-                        // Send an empty result so that processing does not hang
+                        // Send an empty result so that processing does not hang when peek def service called from non-mssql clients
                         await requestContext.SendResult(Array.Empty<Location>());
                     }
 
                     DocumentStatusHelper.SendTelemetryEvent(requestContext, CreatePeekTelemetryProps(succeeded, isConnected));
                 }
+                else
+                {
+                    // Send an empty result so that processing does not hang
+                    await requestContext.SendResult(Array.Empty<Location>());
+                }
 
                 DocumentStatusHelper.SendStatusChange(requestContext, textDocumentPosition, DocumentStatusHelper.DefinitionRequestCompleted);
             }