diff --git a/lib/internal-events.js b/lib/internal-events.js
index 4a9cb5eeb..ba0bed65d 100644
--- a/lib/internal-events.js
+++ b/lib/internal-events.js
@@ -86,6 +86,7 @@ module.exports = function (bs) {
         });
 
     var coreNamespacedWatchers = fromEvent(bs.events, "file:changed")
+        .filter(function() { return bs.options.get("codeSync") })
         .filter(function(x) { return  x.namespace === "core" });
 
     var handler = fileHandler.fileChanges(coreNamespacedWatchers, bs.options)