diff --git a/extensions/notebook/src/jupyter/jupyterServerManager.ts b/extensions/notebook/src/jupyter/jupyterServerManager.ts
index 0b4d715128..0464970fa4 100644
--- a/extensions/notebook/src/jupyter/jupyterServerManager.ts
+++ b/extensions/notebook/src/jupyter/jupyterServerManager.ts
@@ -84,6 +84,7 @@ export class LocalJupyterServerManager implements nb.ServerManager, vscode.Dispo
 	public async stopServer(): Promise<void> {
 		if (this._jupyterServer) {
 			await this._jupyterServer.stop();
+			this._jupyterServer = undefined;
 		}
 	}
 
diff --git a/src/sql/workbench/parts/notebook/browser/models/clientSession.ts b/src/sql/workbench/parts/notebook/browser/models/clientSession.ts
index 455b4f2a4d..13737fbb53 100644
--- a/src/sql/workbench/parts/notebook/browser/models/clientSession.ts
+++ b/src/sql/workbench/parts/notebook/browser/models/clientSession.ts
@@ -78,7 +78,7 @@ export class ClientSession implements IClientSession {
 
 	private async startServer(): Promise<void> {
 		let serverManager = this.notebookManager.serverManager;
-		if (serverManager && !serverManager.isStarted) {
+		if (serverManager) {
 			await serverManager.startServer();
 			if (!serverManager.isStarted) {
 				throw new Error(localize('ServerNotStarted', "Server did not start for unknown reason"));