diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServerWrapper.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServerWrapper.java
index c23c71eee..286e8ac6b 100644
--- a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServerWrapper.java
+++ b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServerWrapper.java
@@ -349,6 +349,9 @@ void stopDispatcher() {
 
 		// Similarly, the error stream should also close when the input/output streams close.
 		this.errorProcessor.shutdownNow();
+
+		// Make sure the timer thread shuts down.
+		this.timer.cancel();
 	}
 
 	/**