diff --git a/libraries/src/Installer/Installer.php b/libraries/src/Installer/Installer.php
index b6f09d3f70d0..9d3f4bede512 100644
--- a/libraries/src/Installer/Installer.php
+++ b/libraries/src/Installer/Installer.php
@@ -208,6 +208,10 @@ public function __construct($basepath = __DIR__, $classprefix = '\\Joomla\\CMS\\
         $this->loadAdapters();
 
         $this->extension = Table::getInstance('Extension');
+
+        if ($this instanceof DatabaseAwareInterface) {
+            $this->setDatabase(Factory::getContainer()->get(DatabaseInterface::class));
+        }
     }
 
     /**