diff --git a/server.js b/server.js
index 13074a4e..76a3edd0 100755
--- a/server.js
+++ b/server.js
@@ -4,7 +4,9 @@
  */
 
 //Load ENV vars from .env
-require('dotenv').config();
+if ((process.env.NODE_ENV || 'development') === 'development') {
+	require('dotenv').config();
+}
 
 var init = require('./config/init')(),
 	config = require('./config/config'),
@@ -18,13 +20,13 @@ var init = require('./config/init')(),
  */
 
 // Bootstrap db connection
-var db = mongoose.connect(config.db.uri, config.db.options, function(err) {
+var db = mongoose.connect(config.db.uri, config.db.options, function (err) {
 	if (err) {
 		console.error(chalk.red('Could not connect to MongoDB!'));
 		console.log(chalk.red(err));
 	}
 });
-mongoose.connection.on('error', function(err) {
+mongoose.connection.on('error', function (err) {
 	console.error(chalk.red('MongoDB connection error: ' + err));
 	process.exit(-1);
 });