diff --git a/app.js b/app.js
index 4ebc9c3e94..12ef392ab3 100644
--- a/app.js
+++ b/app.js
@@ -14,8 +14,7 @@
         options = require('minimist')(process.argv.slice(2)),
         express = require('express'),
         app = express(),
-        fs = require('fs'),
-        bundles = JSON.parse(fs.readFileSync(BUNDLE_FILE, 'utf8'));
+        fs = require('fs');
 
     // Defaults
     options.port = options.port || options.p || 8080;
@@ -40,17 +39,19 @@
         process.exit(0);
     }
 
-    // Handle command line inclusions/exclusions
-    bundles = bundles.concat(options.include);
-    bundles = bundles.filter(function (bundle) {
-        return options.exclude.indexOf(bundle) === -1;
-    });
-    bundles = bundles.filter(function (bundle, index) { // Uniquify
-        return bundles.indexOf(bundle) === index;
-    });
-
     // Override bundles.json for HTTP requests
     app.use('/' + BUNDLE_FILE, function (req, res) {
+        var bundles = JSON.parse(fs.readFileSync(BUNDLE_FILE, 'utf8'));
+
+        // Handle command line inclusions/exclusions
+        bundles = bundles.concat(options.include);
+        bundles = bundles.filter(function (bundle) {
+            return options.exclude.indexOf(bundle) === -1;
+        });
+        bundles = bundles.filter(function (bundle, index) { // Uniquify
+            return bundles.indexOf(bundle) === index;
+        });
+
         res.send(JSON.stringify(bundles));
     });