diff --git a/app.js b/app.js
index fb0a289..bd05672 100644
--- a/app.js
+++ b/app.js
@@ -44,17 +44,19 @@ module.exports = function (opts) {
       this.__write(livereload);
       this.__write(data, enc, cb);
     };
-    serve(req, res, function (err) {
-      if (err) { return done(err); }
-      index(req, res, function (err) {
+
+    function serveStatic() {
+      serve(req, res, function (err) {
         if (err) { return done(err); }
-        if (opts.expressApp) {
-          opts.expressApp(req, res, done);
-        }
-        else {
-          done();
-        }
+        index(req, res, done);
       });
-    });
+    }
+
+    if (opts.expressApp) {
+      opts.expressApp(req, res, serveStatic);
+    }
+    else {
+      serveStatic();
+    }
   };
 };