diff --git a/client/src/node/main.ts b/client/src/node/main.ts
index e021ee412..e1b5eda71 100644
--- a/client/src/node/main.ts
+++ b/client/src/node/main.ts
@@ -502,6 +502,17 @@ export class LanguageClient extends BaseLanguageClient {
 				}
 			}
 			return Promise.reject<MessageTransports>(new Error(`Unsupported server configuration ` + JSON.stringify(server, null, 4)));
+		}).finally(() => {
+			if (this._serverProcess !== undefined) {
+				this._serverProcess.on('exit', (code, signal) => {
+					if (code !== null) {
+						this.error(`Server process exited with code ${code}.`, undefined, false);
+					}
+					if (signal !== null) {
+						this.error(`Server process exited with signal ${signal}.`, undefined, false);
+					}
+				});
+			}
 		});
 	}