diff --git a/src/services.js b/src/services.js
index a5539e7b5..a644a7bf5 100644
--- a/src/services.js
+++ b/src/services.js
@@ -1143,9 +1143,10 @@ async function startMysql(existingInfra) {
     await shell.promises.exec('removeMysql', 'docker rm -f mysql || true');
     await shell.promises.exec('startMysql', runCmd);
 
-    await waitForContainer('mysql', 'CLOUDRON_MYSQL_TOKEN');
-
-    if (upgrading) await importDatabase('mysql');
+    if (!serviceConfig.recoveryMode) {
+        await waitForContainer('mysql', 'CLOUDRON_MYSQL_TOKEN');
+        if (upgrading) await importDatabase('mysql');
+    }
 }
 
 async function setupMySql(app, options) {
@@ -1347,8 +1348,10 @@ async function startPostgresql(existingInfra) {
     await shell.promises.exec('removePostgresql', 'docker rm -f postgresql || true');
     await shell.promises.exec('startPostgresql', runCmd);
 
-    await waitForContainer('postgresql', 'CLOUDRON_POSTGRESQL_TOKEN');
-    if (upgrading) await importDatabase('postgresql');
+    if (!serviceConfig.recoveryMode) {
+        await waitForContainer('postgresql', 'CLOUDRON_POSTGRESQL_TOKEN');
+        if (upgrading) await importDatabase('postgresql');
+    }
 }
 
 async function setupPostgreSql(app, options) {
@@ -1508,8 +1511,10 @@ async function startMongodb(existingInfra) {
     await shell.promises.exec('removeMongodb', 'docker rm -f mongodb || true');
     await shell.promises.exec('startMongodb', runCmd);
 
-    await waitForContainer('mongodb', 'CLOUDRON_MONGODB_TOKEN');
-    if (upgrading) await importDatabase('mongodb');
+    if (!serviceConfig.recoveryMode) {
+        await waitForContainer('mongodb', 'CLOUDRON_MONGODB_TOKEN');
+        if (upgrading) await importDatabase('mongodb');
+    }
 }
 
 async function setupMongoDb(app, options) {
@@ -1782,8 +1787,10 @@ async function setupRedis(app, options) {
         debug(`Re-using existing redis container with state: ${JSON.stringify(result.State)}`);
     }
 
-    await addonConfigs.set(app.id, 'redis', env);
-    await waitForContainer('redis-' + app.id, 'CLOUDRON_REDIS_TOKEN');
+    if (!recoveryMode) {
+        await addonConfigs.set(app.id, 'redis', env);
+        await waitForContainer('redis-' + app.id, 'CLOUDRON_REDIS_TOKEN');
+    }
 }
 
 async function clearRedis(app, options) {