diff --git a/services/migration.js b/services/migration.js
index c663e9703..8748a1cfa 100644
--- a/services/migration.js
+++ b/services/migration.js
@@ -70,8 +70,6 @@ async function migrate() {
                 await options.setOption("db_version", mig.dbVersion);
             });
 
-            sql.setDbReadyAsResolved();
-
             log.info("Migration to version " + mig.dbVersion + " has been successful.");
 
             mig['success'] = true;
@@ -86,6 +84,10 @@ async function migrate() {
         }
     }
 
+    if (sql.isDbUpToDate()) {
+        sql.setDbReadyAsResolved();
+    }
+
     return migrations;
 }