diff --git a/adminer/drivers/mongo.inc.php b/adminer/drivers/mongo.inc.php
index d7e5c35a..ac89542d 100644
--- a/adminer/drivers/mongo.inc.php
+++ b/adminer/drivers/mongo.inc.php
@@ -217,7 +217,7 @@ if (isset($_GET["mongo"])) {
 			function connect($uri, $options) {
 				$class = 'MongoDB\Driver\Manager';
 				$this->_link = new $class($uri, $options);
-				$this->executeCommand('admin', array('ping' => 1));
+				$this->executeCommand($options["db"], array('ping' => 1));
 			}
 			
 			function executeCommand($db, $command) {
@@ -399,7 +399,7 @@ if (isset($_GET["mongo"])) {
 		function get_databases($flush) {
 			global $connection;
 			$return = array();
-			foreach ($connection->executeCommand('admin', array('listDatabases' => 1)) as $dbs) {
+			foreach ($connection->executeCommand($connection->_db_name, array('listDatabases' => 1)) as $dbs) {
 				foreach ($dbs->databases as $db) {
 					$return[] = $db->name;
 				}
diff --git a/changes.txt b/changes.txt
index aea1fcf4..c4f3746f 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,6 +1,7 @@
 Adminer 4.16.0-dev:
 PostgreSQL: Preserve whitespace in EXPLAIN (bug #827)
 Oracle: Include tables granted by other user
+MongoDB: Execute commands against the selected DB
 
 Adminer 4.15.0:
 Escape unknown field in select