diff --git a/gulpfile.js b/gulpfile.js
index e2b23a7..16b7d7f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -151,14 +151,6 @@ gulp.task('locales', function() {
     return gulp.src(paths.locales).pipe(gulp.dest(paths.dest + '/locales'));
 });
 
-gulp.task('serve', function() {
-    server.init({
-        server: {
-            baseDir: './'
-        }
-    });
-});
-
 gulp.task('reload', function(done) {
     server.reload();
     done();
@@ -334,6 +326,17 @@ gulp.task(
     }, 'default')
 );
 
+gulp.task(
+    'serve',
+    gulp.series('debug', function(cb) {
+        server.init({
+            server: {
+                baseDir: './'
+            }
+        });
+        cb();
+    })
+);
 gulp.task('release:zip', function() {
     gutil.log(gutil.colors.green('Build brouter-web.' + nextVersion + '.zip'));
     return gulp
diff --git a/package.json b/package.json
index dc11163..0a1449a 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
         "layers": "node layers/josm/extract.js && node layers/collection/extract.js",
         "test": "gulp",
         "prettier": "prettier --write '**/*'",
-        "serve": "gulp debug && gulp serve watch"
+        "serve": "gulp serve watch"
     },
     "husky": {
         "hooks": {