diff --git a/development_server.js b/development_server.js
index 8ddf929b9..28bdf1eda 100644
--- a/development_server.js
+++ b/development_server.js
@@ -1,8 +1,7 @@
 /* eslint-disable no-console */
 const colors = require('colors/safe');
-const ecstatic = require('ecstatic');
 const gaze = require('gaze');
-const http = require('http');
+const StaticServer = require('static-server');
 
 const isDevelopment = process.argv[2] === 'develop';
 
@@ -53,9 +52,8 @@ if (isDevelopment) {
         });
     });
 
-    http.createServer(
-        ecstatic({ root: __dirname, cache: 0 })
-    ).listen(8080);
-
-    console.log(colors.yellow('Listening on :8080'));
+    const server = new StaticServer({ rootPath: __dirname, port: 8080, followSymlink: true });
+    server.start(function () {
+        console.log(colors.yellow('Listening on ' + server.port));
+    });
 }
diff --git a/package.json b/package.json
index 55f6d1cdb..5ac153567 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,6 @@
     "colors": "^1.1.2",
     "concat-files": "^0.1.1",
     "d3": "~5.9.2",
-    "ecstatic": "^4.1.2",
     "editor-layer-index": "github:osmlab/editor-layer-index#gh-pages",
     "eslint": "^5.16.0",
     "gaze": "^1.1.1",
@@ -94,6 +93,7 @@
     "sinon": "7.3.2",
     "sinon-chai": "^3.1.0",
     "smash": "0.0",
+    "static-server": "^2.2.1",
     "svg-sprite": "1.5.0",
     "temaki": "1.2.0",
     "uglify-js": "~3.5.10"