diff --git a/src/vs/editor/contrib/snippet/snippetController2.ts b/src/vs/editor/contrib/snippet/snippetController2.ts
index 75e8ad4ff8623aa30e80d8b0f7212b2383686c4a..a09aa96db7452880ba80b942fc591a6d376ff7f1 100644
--- a/src/vs/editor/contrib/snippet/snippetController2.ts
+++ b/src/vs/editor/contrib/snippet/snippetController2.ts
@@ -208,7 +208,7 @@ export class SnippetController2 implements IEditorContribution {
 		this._inSnippet.reset();
 		this._hasPrevTabstop.reset();
 		this._hasNextTabstop.reset();
-		dispose(this._snippetListener);
+		this._snippetListener.clear();
 		dispose(this._session);
 		this._session = undefined;
 		this._modelVersionId = -1;
diff --git a/src/vs/editor/contrib/suggest/suggestController.ts b/src/vs/editor/contrib/suggest/suggestController.ts
index 600cfc5227369b6550a08806630881c477a4ce7b..aac58cf801d8fd73b3892efc8afc2bdcc4268d64 100644
--- a/src/vs/editor/contrib/suggest/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/suggestController.ts
@@ -149,6 +149,7 @@ export class SuggestController implements IEditorContribution {
 	}
 
 	dispose(): void {
+		this._alternatives.dispose();
 		this._toDispose.dispose();
 		this._widget.dispose();
 		this._model.dispose();