diff --git a/src/server/config/serverConfig.js b/src/server/config/serverConfig.js
index 91977ee0..5daf9883 100644
--- a/src/server/config/serverConfig.js
+++ b/src/server/config/serverConfig.js
@@ -7,7 +7,7 @@ module.exports = {
 	// sqlite
 	// rethink
 	//eslint-disable-next-line no-process-env
-	db: process.env.IWD_DB || 'rethink',
+	db: process.env.IWD_DB || 'sqlite',
 	//eslint-disable-next-line no-process-env
 	dbHost: process.env.IWD_DB_HOST || 'localhost',
 	//eslint-disable-next-line no-process-env
diff --git a/src/server/world/atlas.js b/src/server/world/atlas.js
index 8120c3bf..b0909588 100644
--- a/src/server/world/atlas.js
+++ b/src/server/world/atlas.js
@@ -17,6 +17,10 @@ module.exports = {
 	},
 
 	addObject: async function (obj, keepPos, transfer) {
+		const serverObj = objects.objects.find(o => o.id === obj.id);
+		if (!serverObj)
+			return;
+
 		events.emit('onBeforePlayerEnterWorld', obj);
 
 		let thread;
@@ -39,8 +43,6 @@ module.exports = {
 				thread = this.getThreadFromName(map.name);
 		}
 
-		const serverObj = objects.objects.find(o => o.id === obj.id);
-
 		obj.zoneName = thread.name;
 		obj.zoneId = thread.id;