diff --git a/config/services.php b/config/services.php
index efd9223df..4550feafa 100644
--- a/config/services.php
+++ b/config/services.php
@@ -73,8 +73,13 @@ return [
         App\Doctrine\Event\SetExplicitChangeTracking $eventChangeTracking,
         Psr\EventDispatcher\EventDispatcherInterface $dispatcher
     ) {
+        $dbSettings = $environment->getDatabaseSettings();
+        if (isset($dbSettings['unix_socket'])) {
+            unset($dbSettings['host'], $dbSettings['port']);
+        }
+
         $connectionOptions = array_merge(
-            $environment->getDatabaseSettings(),
+            $dbSettings,
             [
                 'driver' => 'pdo_mysql',
                 'charset' => 'utf8mb4',
diff --git a/src/Enums/SupportedLocales.php b/src/Enums/SupportedLocales.php
index 92d9eb8e4..a65b01d94 100644
--- a/src/Enums/SupportedLocales.php
+++ b/src/Enums/SupportedLocales.php
@@ -67,10 +67,13 @@ enum SupportedLocales: string
 
     public function register(Environment $environment): void
     {
-        $translator = Loader::getInstance();
-        $translator->setlocale($this->value);
-        $translator->textdomain('default');
-        $translator->bindtextdomain('default', $environment->getBaseDirectory() . '/resources/locale');
+        // Skip translation file reading for default locale.
+        if ($this !== self::default()) {
+            $translator = Loader::getInstance();
+            $translator->setlocale($this->value);
+            $translator->textdomain('default');
+            $translator->bindtextdomain('default', $environment->getBaseDirectory() . '/resources/locale');
+        }
 
         Loader::loadFunctions();
     }
diff --git a/src/Environment.php b/src/Environment.php
index 2ed8920e1..1f30e2b10 100644
--- a/src/Environment.php
+++ b/src/Environment.php
@@ -287,17 +287,15 @@ class Environment
     public function getDatabaseSettings(): array
     {
         $dbSettings = [
+            'host' => $this->data[self::DB_HOST] ?? 'localhost',
+            'port' => (int)($this->data[self::DB_PORT] ?? 3306),
             'dbname' => $this->data[self::DB_NAME] ?? 'azuracast',
             'user' => $this->data[self::DB_USER] ?? 'azuracast',
             'password' => $this->data[self::DB_PASSWORD] ?? 'azur4c457',
         ];
 
-        $host = $this->data[self::DB_HOST] ?? 'localhost';
-        if ('localhost' === $host) {
+        if ('localhost' === $dbSettings['host']) {
             $dbSettings['unix_socket'] = '/run/mysqld/mysqld.sock';
-        } else {
-            $dbSettings['host'] = $host;
-            $dbSettings['port'] = (int)($this->data[self::DB_PORT] ?? 3306);
         }
 
         return $dbSettings;