diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.test.ts
index acc936a56b7..004b53a635a 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.test.ts
@@ -1403,7 +1403,7 @@ suite('Notebook API tests', function () {
 		assert.strictEqual(vscode.window.activeNotebookEditor!.selection?.document.getText(), 'var abc = 0;');
 
 		// no kernel -> no default language
-		assert.strictEqual(vscode.window.activeNotebookEditor!.kernel, undefined);
+		// assert.strictEqual(vscode.window.activeNotebookEditor!.kernel, undefined);
 		assert.strictEqual(vscode.window.activeNotebookEditor!.selection?.language, 'typescript');
 
 		await vscode.commands.executeCommand('vscode.openWith', resource, 'default');
@@ -1511,6 +1511,21 @@ suite('Notebook API tests', function () {
 		await saveAllFilesAndCloseAll(resource);
 	});
 
+
+	test('#116808, active kernel should not be undefined', async function () {
+		assertInitalState();
+		const resource = await createRandomFile('', undefined, '.vsctestnb');
+		await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest');
+
+		await withEvent(vscode.notebook.onDidChangeActiveNotebookKernel, async event => {
+			await event;
+			assert.notStrictEqual(vscode.window.activeNotebookEditor?.kernel, undefined);
+			assert.strictEqual(vscode.window.activeNotebookEditor?.kernel?.id, 'mainKernel');
+		});
+
+		await saveAllFilesAndCloseAll(resource);
+	});
+
 	// });
 
 	// suite('webview', () => {
diff --git a/src/vs/workbench/api/browser/mainThreadNotebook.ts b/src/vs/workbench/api/browser/mainThreadNotebook.ts
index b9ba768326d..f761a9fec14 100644
--- a/src/vs/workbench/api/browser/mainThreadNotebook.ts
+++ b/src/vs/workbench/api/browser/mainThreadNotebook.ts
@@ -556,6 +556,7 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 				const result: INotebookKernel[] = [];
 				const kernelsDto = await that._proxy.$provideNotebookKernels(handle, uri, token);
 				for (const dto of kernelsDto) {
+					console.log('kerneldto', dto.providerHandle);
 
 					result.push({
 						id: dto.id,
diff --git a/src/vs/workbench/api/common/extHostNotebook.ts b/src/vs/workbench/api/common/extHostNotebook.ts
index b58b4880b57..04a5cd56a2c 100644
--- a/src/vs/workbench/api/common/extHostNotebook.ts
+++ b/src/vs/workbench/api/common/extHostNotebook.ts
@@ -123,6 +123,7 @@ export class ExtHostNotebookKernelProviderAdapter extends Disposable {
 				label: kernel.label,
 				extension: this._extension.identifier,
 				extensionLocation: this._extension.extensionLocation,
+				providerHandle: this._handle,
 				description: kernel.description,
 				detail: kernel.detail,
 				isPreferred: kernel.isPreferred,