diff --git a/libs/common/src/database/database.module.ts b/libs/common/src/database/database.module.ts
index 8540d22..b4c695d 100644
--- a/libs/common/src/database/database.module.ts
+++ b/libs/common/src/database/database.module.ts
@@ -111,7 +111,7 @@ import { winstonLoggerOptions } from '../logger/services/winston.logger';
             charset: 'utf8mb4',
             max: 20, // set pool max size
             idleTimeoutMillis: 5000, // close idle clients after 5 second
-            connectionTimeoutMillis: 11_000, // return an error after 11 second if connection could not be established
+            connectionTimeoutMillis: 12_000, // return an error after 11 second if connection could not be established
             maxUses: 7500, // close (and replace) a connection after it has been used 7500 times (see below for discussion)
           },
           continuationLocalStorage: true,
diff --git a/src/device/services/device.service.ts b/src/device/services/device.service.ts
index e00858c..9b78de5 100644
--- a/src/device/services/device.service.ts
+++ b/src/device/services/device.service.ts
@@ -685,7 +685,7 @@ export class DeviceService {
       return {
         ...rest,
         productUuid: product.uuid,
-        name: deviceDetails.name,
+        name: deviceDetails?.name,
         productName: product.name,
       } as GetDeviceDetailsInterface;
     } catch (error) {