diff --git a/lib/logic/cubit/server_installation/server_installation_repository.dart b/lib/logic/cubit/server_installation/server_installation_repository.dart
index dd9bde1f..ae1a1fe5 100644
--- a/lib/logic/cubit/server_installation/server_installation_repository.dart
+++ b/lib/logic/cubit/server_installation/server_installation_repository.dart
@@ -164,13 +164,14 @@ class ServerInstallationRepository {
       return RecoveryStep.serverProviderToken;
     }
 
-    /// We don't write anything to the database after .serverSelection
-    /// step, therefore we have to re-ask it again before prompting for
-    /// DNS token, if it wasn't provided yet.
-    if (dnsProviderToken == null) {
+    if (serverDetails.serverLocation == null) {
       return RecoveryStep.serverSelection;
     }
 
+    if (dnsProviderToken == null) {
+      return RecoveryStep.dnsProviderToken;
+    }
+
     return RecoveryStep.backblazeToken;
   }