diff --git a/library/includes/init_bb.php b/library/includes/init_bb.php
index 932dba5a1..f8f0cd0c2 100644
--- a/library/includes/init_bb.php
+++ b/library/includes/init_bb.php
@@ -378,7 +378,9 @@ function make_url(string $path = ''): string
  */
 require_once INC_DIR . '/functions.php';
 
-$bb_cfg = array_merge(bb_get_config(BB_CONFIG), $bb_cfg);
+// Merge database configuration with base configuration using singleton
+config()->merge(bb_get_config(BB_CONFIG));
+$bb_cfg = config()->all();
 
 $log_action = new TorrentPier\Legacy\LogAction();
 $wordCensor = new TorrentPier\Censor();