diff --git a/src/server/session.ts b/src/server/session.ts
index 0b746e4090a57..ebb1dfe201c43 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -1173,10 +1173,10 @@ namespace ts.server {
             const position = this.getPosition(args, scriptInfo);
 
             const completions = project.getLanguageService().getCompletionsAtPosition(file, position);
-            if (!completions) {
-                return emptyArray;
-            }
             if (simplifiedResult) {
+                if (!completions) {
+                    return emptyArray;
+                }
                 return mapDefined(completions.entries, entry => {
                     if (completions.isMemberCompletion || (entry.name.toLowerCase().indexOf(prefix.toLowerCase()) === 0)) {
                         const { name, kind, kindModifiers, sortText, replacementSpan } = entry;
@@ -1186,7 +1186,12 @@ namespace ts.server {
                 }).sort((a, b) => compareStrings(a.name, b.name));
             }
             else {
-                return completions;
+                return completions || {
+                    isGlobalCompletion: false,
+                    isMemberCompletion: false,
+                    isNewIdentifierLocation: false,
+                    entries: [],
+                };
             }
         }