diff --git a/Form/FormFlow.php b/Form/FormFlow.php
index 10932925..39ceee49 100644
--- a/Form/FormFlow.php
+++ b/Form/FormFlow.php
@@ -942,7 +942,7 @@ public function redirectAfterSubmit(FormInterface $submittedForm) {
 					return true;
 				default:
 					// redirect after submit only if there are no errors for the submitted form
-					return $submittedForm->isValid();
+					return $submittedForm->isSubmitted() && $submittedForm->isValid();
 			}
 		}