diff --git a/gulpfile.js b/gulpfile.js
index e197a3a52e..e988f43a6e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -225,10 +225,17 @@ gulp.task('build/checkCircularDependencies', function (done) {
 
 // ------------------
 // web servers
-gulp.task('serve.js.dev', jsserve(gulp, gulpPlugins, {
-  path: CONFIG.dest.js.dev.es5,
-  port: 8000
-}));
+gulp.task('serve.js.dev', ['build.js.dev'], function(neverDone) {
+  watch('modules/**', function() {
+    gulp.start('!broccoli.js.dev');
+  });
+
+  jsserve(gulp, gulpPlugins, {
+    path: CONFIG.dest.js.dev.es5,
+    port: 8000
+  })();
+});
+
 
 gulp.task('serve.js.prod', jsserve(gulp, gulpPlugins, {
   path: CONFIG.dest.js.prod.es5,