diff --git a/entrypoint.sh b/entrypoint.sh
index 9d06bfa..0f72969 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -5,18 +5,18 @@ if [ -n "${MONGO_URL:-}" ]; then # Check for MongoDB connection if MONGO_URL is
     cd bundle/programs/server/npm/node_modules/meteor/npm-mongo/node_modules
 	node <<- 'EOJS'
 	const mongoClient = require('mongodb').MongoClient;
-	setInterval(function() {
-		mongoClient.connect(process.env.MONGO_URL, function(err, client) {
-			if (client) {
-				console.log('Successfully connected to MongoDB');
-				client.close();
-			}
-			if (err) {
-				console.error(err);
-			} else {
-				process.exit(0);
-			}
-		});
+	setInterval(async function() {
+		let client;
+		try {
+			client = await mongoClient.connect(process.env.MONGO_URL);
+		} catch (err) {
+			console.error(err);
+		}
+		if (client && client.topology.isConnected()) {
+			console.log('Successfully connected to MongoDB');
+			client.close();
+			process.exit(0);
+		}
 	}, 1000);
 	EOJS
 fi
diff --git a/package.json b/package.json
index bbccde4..d709bd4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "titra",
-  "version": "0.99.24",
+  "version": "0.99.25",
   "private": true,
   "scripts": {
     "start": "meteor run"