diff --git a/app/init.php b/app/init.php
index e40857d92..57f2dc713 100644
--- a/app/init.php
+++ b/app/init.php
@@ -258,7 +258,6 @@ $register->set('dbPool', function () { // Register DB connection
     $dbPass = App::getEnv('_APP_DB_PASS', '');
     $dbScheme = App::getEnv('_APP_DB_SCHEMA', '');
 
-
     $pool = new PDOPool((new PDOConfig())
         ->withHost($dbHost)
         ->withPort($dbPort)
@@ -266,6 +265,9 @@ $register->set('dbPool', function () { // Register DB connection
         ->withCharset('utf8mb4')
         ->withUsername($dbUser)
         ->withPassword($dbPass)
+        ->withOptions([
+            PDO::ATTR_ERRMODE => App::isDevelopment() ? PDO::ERRMODE_WARNING : PDO::ERRMODE_SILENT, // If in production mode, warnings are not displayed
+        ])
     , 16);
 
     return $pool;
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index 020f36908..14b5a0818 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -324,7 +324,7 @@ services:
       - MYSQL_DATABASE=${_APP_DB_SCHEMA}
       - MYSQL_USER=${_APP_DB_USER}
       - MYSQL_PASSWORD=${_APP_DB_PASS}
-    command: 'mysqld --innodb-flush-method=fsync --wait_timeout=86400'
+    command: 'mysqld --innodb-flush-method=fsync'
 
   redis:
     image: redis:6.0-alpine3.12
diff --git a/docker-compose.yml b/docker-compose.yml
index 943746175..ac12f2010 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -382,7 +382,7 @@ services:
       - MYSQL_DATABASE=${_APP_DB_SCHEMA}
       - MYSQL_USER=user
       - MYSQL_PASSWORD=${_APP_DB_PASS}
-    command: 'mysqld --innodb-flush-method=fsync --wait_timeout=86400' # add ' --query_cache_size=0' for DB tests
+    command: 'mysqld --innodb-flush-method=fsync' # add ' --query_cache_size=0' for DB tests
     # command: mv /var/lib/mysql/ib_logfile0 /var/lib/mysql/ib_logfile0.bu && mv /var/lib/mysql/ib_logfile1 /var/lib/mysql/ib_logfile1.bu
 
   # smtp: