diff --git a/src/Connection.php b/src/Connection.php
index 29b72ae44..3fa99e94b 100644
--- a/src/Connection.php
+++ b/src/Connection.php
@@ -214,7 +214,7 @@ protected function withFreshQueryLog($callback)
     protected function getDefaultDatabaseName(string $dsn, array $config): string
     {
         if (empty($config['database'])) {
-            if (! preg_match('/^mongodb(?:[+]srv)?:\\/\\/.+\\/([^?&]+)/s', $dsn, $matches)) {
+            if (! preg_match('/^mongodb(?:[+]srv)?:\\/\\/.+?\\/([^?&]+)/s', $dsn, $matches)) {
                 throw new InvalidArgumentException('Database is not properly configured.');
             }
 
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
index 1f970d819..de77da7f7 100644
--- a/tests/ConnectionTest.php
+++ b/tests/ConnectionTest.php
@@ -190,6 +190,12 @@ public static function dataConnectionConfig(): Generator
             'expectedDatabaseName' => 'tests',
             'config' => ['dsn' => 'mongodb://some-host:12345/tests'],
         ];
+
+        yield 'Database is extracted from DSN with CA path in options' => [
+            'expectedUri' => 'mongodb://some-host:12345/tests?tls=true&tlsCAFile=/path/to/ca.pem&retryWrites=false',
+            'expectedDatabaseName' => 'tests',
+            'config' => ['dsn' => 'mongodb://some-host:12345/tests?tls=true&tlsCAFile=/path/to/ca.pem&retryWrites=false'],
+        ];
     }
 
     #[DataProvider('dataConnectionConfig')]