diff --git a/api/lib/db/connectDb.js b/api/lib/db/connectDb.js
index 6fdd4aad0c..c6a34c6fdd 100644
--- a/api/lib/db/connectDb.js
+++ b/api/lib/db/connectDb.js
@@ -27,7 +27,6 @@ async function connectDb() {
   if (!cached.promise || disconnected) {
     const opts = {
       bufferCommands: false,
-      dbName: MONGO_DB_NAME,
       // useNewUrlParser: true,
       // useUnifiedTopology: true,
       // bufferMaxEntries: 0,
@@ -35,6 +34,10 @@ async function connectDb() {
       // useCreateIndex: true
     };
 
+    if (MONGO_DB_NAME) {
+      opts.dbName = MONGO_DB_NAME;
+    }
+
     mongoose.set('strictQuery', true);
     cached.promise = mongoose.connect(MONGO_URI, opts).then((mongoose) => {
       return mongoose;
diff --git a/api/test/jestSetup.js b/api/test/jestSetup.js
index 96ac712220..4511a77a13 100644
--- a/api/test/jestSetup.js
+++ b/api/test/jestSetup.js
@@ -2,7 +2,7 @@
 require('dotenv').config({ path: './test/.env.test' });
 
 process.env.MONGO_URI = 'mongodb://127.0.0.1:27017/dummy-uri';
-process.env.MONGO_DB_NAME = 'librechat-test'
+process.env.MONGO_DB_NAME = 'librechat-test';
 process.env.BAN_VIOLATIONS = 'true';
 process.env.BAN_DURATION = '7200000';
 process.env.BAN_INTERVAL = '20';