diff --git a/server/src/services/DeviceUseCases.ts b/server/src/services/DeviceUseCases.ts
index 96b1a2bb..2790b48e 100644
--- a/server/src/services/DeviceUseCases.ts
+++ b/server/src/services/DeviceUseCases.ts
@@ -235,11 +235,12 @@ async function checkDockerConnection(
     );
     const agent = getCustomAgent(logger, {
       ...options.sshOptions,
+      timeout: 60000,
     });
     options.modem = new DockerModem({
       agent: agent,
     });
-    const dockerApi = new Dockerode(options);
+    const dockerApi = new Dockerode({ ...options, timeout: 60000 });
     await dockerApi.ping();
     await dockerApi.info();
     return {