diff --git a/lib/logic/cubit/server_installation/server_installation_repository.dart b/lib/logic/cubit/server_installation/server_installation_repository.dart
index b495ec0d..05863b83 100644
--- a/lib/logic/cubit/server_installation/server_installation_repository.dart
+++ b/lib/logic/cubit/server_installation/server_installation_repository.dart
@@ -323,6 +323,7 @@ class ServerInstallationRepository {
           },
           cancelButtonOnPressed: onCancel,
         );
+        return;
       }
 
       saveServerDetails(createServerResult.data!);
diff --git a/lib/logic/cubit/server_installation/server_installation_state.dart b/lib/logic/cubit/server_installation/server_installation_state.dart
index 69934bbd..331c3e2a 100644
--- a/lib/logic/cubit/server_installation/server_installation_state.dart
+++ b/lib/logic/cubit/server_installation/server_installation_state.dart
@@ -48,7 +48,7 @@ abstract class ServerInstallationState extends Equatable {
 
   bool get isFullyInitilized => _fulfilementList.every((final el) => el!);
   ServerSetupProgress get progress => ServerSetupProgress
-      .values[_fulfilementList.where((final el) => el!).length + 1];
+      .values[_fulfilementList.where((final el) => el!).length];
 
   int get porgressBar {
     if (progress.index < 6) {