diff --git a/lib/ace/mode/xquery_worker.js b/lib/ace/mode/xquery_worker.js
index 3abea595..64174b79 100644
--- a/lib/ace/mode/xquery_worker.js
+++ b/lib/ace/mode/xquery_worker.js
@@ -71,13 +71,11 @@ oop.inherits(XQueryWorker, Mirror);
 	        type: "error"
        });
       }	
-      var tokens = parser.highlighter.getTokens();
-      this.sender.emit("highlight", tokens);
-      return;
+    } else {
+     this.sender.emit("ok");
     }
     var tokens = parser.highlighter.getTokens();
     this.sender.emit("highlight", tokens);
-    this.sender.emit("ok");
   };
     
 }).call(XQueryWorker.prototype);