diff --git a/server.js b/server.js
index 73a5ca3..a8fc728 100644
--- a/server.js
+++ b/server.js
@@ -7,9 +7,6 @@ const config = require('nconf')
 const log = require('loglevel');
 log.setLevel(config.get('log_level'));
 
-//DB
-require('./server/db.js').connect();
-
 //Server
 const app = require('./server/app.js');
 
@@ -29,7 +26,11 @@ app.use((req, res, next) => {
 });
 */
 
-const PORT = process.env.PORT || 8000;
-const httpServer = app.listen(PORT, () => {
-	log.info(`server on port:${PORT}`);
-});
\ No newline at end of file
+require('./server/db.js').connect()
+	.then(()=>{
+		const PORT = process.env.PORT || 8000;
+		const httpServer = app.listen(PORT, () => {
+			log.info(`server on port:${PORT}`);
+		});
+	})
+	.catch((err)=>console.error(err))
diff --git a/server/db.js b/server/db.js
index d0756bf..6ee653e 100644
--- a/server/db.js
+++ b/server/db.js
@@ -7,7 +7,7 @@ const dbPath = process.env.MONGODB_URI || process.env.MONGOLAB_URI || 'mongodb:/
 module.exports = {
 	connect : ()=>{
 		return new Promise((resolve, reject)=>{
-			if(mongoose.connection.readyState == 1){
+			if(mongoose.connection.readyState !== 0){
 				log.warn('DB already connected');
 				return resolve();
 			}