diff --git a/app.js b/app.js
index 26336a74c8..0e5b8ff69b 100644
--- a/app.js
+++ b/app.js
@@ -203,7 +203,8 @@ function upgrade() {
 		// Skip build
 		tasks.pop();
 	}
-
+	//disable mongo timeouts during upgrade
+	nconf.set('mongo:options:socketTimeoutMS', 0);
 	async.series(tasks, function (err) {
 		if (err) {
 			winston.error(err.stack);