diff --git a/app.js b/app.js
index 15d74ecc05..66dae98073 100644
--- a/app.js
+++ b/app.js
@@ -144,7 +144,7 @@ function start() {
 
 					async.waterfall([
 						async.apply(plugins.ready),
-						async.apply(webserver.init),
+						async.apply(meta.templates.compile),
 						async.apply(webserver.listen)
 					], function(err) {
 						if (err) {
diff --git a/src/webserver.js b/src/webserver.js
index af561d6ad4..e100dbd066 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -117,16 +117,10 @@ if(nconf.get('ssl')) {
 
 	module.exports.server = server;
 
-	module.exports.init = function(callback) {
-
-		emitter.all(['templates:compiled', 'meta:js.compiled', 'meta:css.compiled'], function() {
-			winston.info('NodeBB Ready');
-			emitter.emit('nodebb:ready');
-			emitter.removeAllListeners('templates:compiled').removeAllListeners('meta:js.compiled').removeAllListeners('meta:css.compiled');
-		});
-
-		meta.templates.compile(callback);
-	};
+	emitter.all(['templates:compiled', 'meta:js.compiled', 'meta:css.compiled'], function() {
+		winston.info('NodeBB Ready');
+		emitter.emit('nodebb:ready');
+	});
 
 	module.exports.listen = function(callback) {
 		var	bind_address = ((nconf.get('bind_address') === "0.0.0.0" || !nconf.get('bind_address')) ? '0.0.0.0' : nconf.get('bind_address')) + ':' + port;