diff --git a/app.js b/app.js
index d79c33d9d2..9b1be2a29a 100644
--- a/app.js
+++ b/app.js
@@ -51,7 +51,7 @@ winston.info('This program comes with ABSOLUTELY NO WARRANTY.');
 winston.info('This is free software, and you are welcome to redistribute it under certain conditions.');
 winston.info('');
 
-if (!fs.existsSync(__dirname + '/config.json') || (!nconf.get('setup') && !nconf.get('upgrade'))) {
+if (fs.existsSync(__dirname + '/config.json') && (!nconf.get('setup') && !nconf.get('upgrade'))) {
 	// Load server-side config
 	nconf.file({ file: __dirname + '/config.json'});