diff --git a/app/init.php b/app/init.php
index c201c0b4a3..04836b0ea1 100644
--- a/app/init.php
+++ b/app/init.php
@@ -1451,9 +1451,9 @@ App::setResource('deviceForBuilds', function ($project) {
     return getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId());
 }, ['project']);
 
-function getDevice(string $root, ?string $connection = null): Device
+function getDevice(string $root, string $connection = ''): Device
 {
-    $connection = empty($connection) ? System::getEnv('_APP_CONNECTIONS_STORAGE', '') : System::getEnv($connection, '');
+    $connection = !empty($connection) ? $connection : System::getEnv('_APP_CONNECTIONS_STORAGE', '');
 
     if (!empty($connection)) {
         $acl = 'private';