diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index ea1e92c3..41e0fa15 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -886,8 +886,9 @@ var EditSession = function(text, mode) {
             this.$modes["ace/mode/text"] = new TextMode();
 
         if (this.$modes[path] && !options) {
-            cb && cb(this.mode);
-            return this.$onChangeMode(this.$modes[path]);
+            this.$onChangeMode(this.$modes[path]);
+            cb && cb();
+            return;
         }
         // load on demand
         this.$modeId = path;
@@ -903,7 +904,7 @@ var EditSession = function(text, mode) {
                     m.$id = path;
                 }
                 this.$onChangeMode(m);
-                cb && cb(this.mode);
+                cb && cb();
             }
         }.bind(this));