diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java
index 70d4b6a80..3c2016e45 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java
@@ -124,7 +124,12 @@ public class MongoStorage implements StorageImplementation {
                 .uuidRepresentation(UuidRepresentation.JAVA_LEGACY);
 
         if (!Strings.isNullOrEmpty(this.connectionUri)) {
-            this.mongoClient = new MongoClient(new MongoClientURI(this.connectionUri, options));
+            MongoClientURI uri = new MongoClientURI(this.connectionUri, options);
+            this.mongoClient = new MongoClient(uri);
+
+            String databaseName = uri.getDatabase() != null ? uri.getDatabase() : this.configuration.getDatabase();
+            this.database = this.mongoClient.getDatabase(databaseName);
+
         } else {
             MongoCredential credential = null;
             if (!Strings.isNullOrEmpty(this.configuration.getUsername())) {
@@ -148,9 +153,9 @@ public class MongoStorage implements StorageImplementation {
             } else {
                 this.mongoClient = new MongoClient(address, credential, options.build());
             }
+
+            this.database = this.mongoClient.getDatabase(this.configuration.getDatabase());
         }
-        
-        this.database = this.mongoClient.getDatabase(this.configuration.getDatabase());
 
         try {
             ensureIndexes();