diff --git a/app/music_on_hold/resources/classes/switch_music_on_hold.php b/app/music_on_hold/resources/classes/switch_music_on_hold.php
index d49ad0414b..30381ffef2 100644
--- a/app/music_on_hold/resources/classes/switch_music_on_hold.php
+++ b/app/music_on_hold/resources/classes/switch_music_on_hold.php
@@ -35,9 +35,15 @@ include "root.php";
 		public $select_value;
 		public $select_options;
 		private $xml;
+		private $db;
 
 		public function __construct() {
-			require_once "resources/classes/database.php";
+			if (!$this->db) {
+				require_once "resources/classes/database.php";
+				$database = new database;
+				$database->connect();
+				$this->db = $database->db;
+			}
 			$this->domain_uuid = $_SESSION['domain_uuid'];
 		}
 
@@ -76,7 +82,7 @@ include "root.php";
 			//recordings
 				if (is_dir($_SERVER["PROJECT_ROOT"].'/app/recordings')) {
 					require_once "app/recordings/resources/classes/switch_recordings.php";
-					$recordings_c = new recordings;
+					$recordings_c = new switch_recordings;
 					$recordings = $recordings_c->list_recordings();
 					if (sizeof($recordings) > 0) {
 						$select .= "<optgroup label='".$text['label-recordings']."'>";
diff --git a/app/recordings/resources/classes/switch_recordings.php b/app/recordings/resources/classes/switch_recordings.php
index bde392616c..4e8631f6a6 100644
--- a/app/recordings/resources/classes/switch_recordings.php
+++ b/app/recordings/resources/classes/switch_recordings.php
@@ -30,9 +30,15 @@ include "root.php";
 	class switch_recordings {
 
 		public $domain_uuid;
+		private $db;
 
 		public function __construct() {
-			require_once "resources/classes/database.php";
+			if (!$this->db) {
+				require_once "resources/classes/database.php";
+				$database = new database;
+				$database->connect();
+				$this->db = $database->db;
+			}
 			$this->domain_uuid = $_SESSION['domain_uuid'];
 		}