diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index f1ab7fd..98e1ea1 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -6,7 +6,7 @@ parameters:
 			path: src/AbstractWizard.php
 
 		-
-			message: "#^Method Arcanist\\\\AbstractWizard\\:\\:firstIncompleteStep\\(\\) should return Arcanist\\\\WizardStep but returns Arcanist\\\\WizardStep\\|null\\.$#"
+			message: "#^Method Arcanist\\\\AbstractWizard\\:\\:firstIncompleteStep\\(\\) should return Arcanist\\\\WizardStep but returns mixed\\.$#"
 			count: 1
 			path: src/AbstractWizard.php
 
diff --git a/src/AbstractWizard.php b/src/AbstractWizard.php
index 30881de..041a4d0 100644
--- a/src/AbstractWizard.php
+++ b/src/AbstractWizard.php
@@ -509,7 +509,7 @@ private function isLastStep(): bool
 
     private function firstIncompleteStep(): WizardStep
     {
-        return collect($this->availableSteps())->first(fn (WizardStep $step) => !$step->isComplete());
+        return collect($this->availableSteps())->first(fn (WizardStep $step) => !$step->isComplete(), $this->steps[count($this->steps) - 1]);
     }
 
     /**