diff --git a/lib/ace/mode/javascript.js b/lib/ace/mode/javascript.js
index 3d4d62d2..f18ec329 100644
--- a/lib/ace/mode/javascript.js
+++ b/lib/ace/mode/javascript.js
@@ -152,6 +152,10 @@ oop.inherits(Mode, TextMode);
             session.setAnnotations(errors)
         });
         
+        worker.on("terminate", function() {
+            session.clearAnnotations();
+        });
+        
         return worker;
     };
 
diff --git a/lib/ace/worker/worker_client.js b/lib/ace/worker/worker_client.js
index 81a516a7..71d6505e 100644
--- a/lib/ace/worker/worker_client.js
+++ b/lib/ace/worker/worker_client.js
@@ -65,6 +65,7 @@ var WorkerClient = function(baseUrl, topLevelNamespaces, module, classname) {
     oop.implement(this, EventEmitter);
 
     this.terminate = function() {
+        this._dispatchEvent("terminate", {});
         this.$worker.terminate();
     };