diff --git a/code-actions-sample/src/extension.ts b/code-actions-sample/src/extension.ts
index 2279301f..9d5a8676 100644
--- a/code-actions-sample/src/extension.ts
+++ b/code-actions-sample/src/extension.ts
@@ -7,15 +7,14 @@ import { subscribeToDocumentChanges, EMOJI_MENTION } from './diagnostics';
 
 const COMMAND = 'code-actions-sample.command';
 
-var emojiDiagnostics: vscode.DiagnosticCollection;
-
 export function activate(context: vscode.ExtensionContext) {
 	context.subscriptions.push(
 		vscode.languages.registerCodeActionsProvider('markdown', new Emojizer(), {
 			providedCodeActionKinds: Emojizer.providedCodeActionKinds
 		}));
 
-	emojiDiagnostics = vscode.languages.createDiagnosticCollection("emoji");
+	const emojiDiagnostics = vscode.languages.createDiagnosticCollection("emoji");
+	context.subscriptions.push(emojiDiagnostics);
 
 	subscribeToDocumentChanges(context, emojiDiagnostics);
 
@@ -30,12 +29,6 @@ export function activate(context: vscode.ExtensionContext) {
 	);
 }
 
-export function deactivate(context: vscode.ExtensionContext) {
-	if (emojiDiagnostics) {
-		emojiDiagnostics.dispose();
-	}
-}
-
 /**
  * Provides code actions for converting :) to an smiley emoji.
  */