diff --git a/src/server/index.coffee b/src/server/index.coffee
index c79469e2f8..e83897714a 100644
--- a/src/server/index.coffee
+++ b/src/server/index.coffee
@@ -14,6 +14,7 @@ toobusy = require 'toobusy'
 
 racer = require 'racer'
 racer.io.set('transports', ['xhr-polling'])
+racer.set('bundleTimeout', 6000)
 unless process.env.NODE_ENV == 'production'
   racer.use(racer.logPlugin)
   derby.use(derby.logPlugin)