diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx
index 8f85934ab8573..f4ef2278951e7 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx
@@ -117,10 +117,12 @@ const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
     schema,
   });
   const { getFields, reset, submit } = form;
-  const [{ index, ruleType }] = (useFormData<DefineStepRule>({
+  const [{ index: formIndex, ruleType: formRuleType }] = (useFormData({
     form,
     watch: ['index', 'ruleType'],
-  }) as unknown) as [DefineStepRule];
+  }) as unknown) as [Partial<DefineStepRule>];
+  const index = formIndex || initialState.index;
+  const ruleType = formRuleType || initialState.ruleType;
   const [
     { browserFields, indexPatterns: indexPatternQueryBar, isLoading: indexPatternLoadingQueryBar },
   ] = useFetchIndexPatterns(index, RuleStep.defineRule);
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx
index 0c1749c8459bb..786ed369955a3 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx
@@ -92,10 +92,11 @@ const StepRuleActionsComponent: FC<StepRuleActionsProps> = ({
     schema,
   });
   const { getFields, submit } = form;
-  const [{ throttle }] = (useFormData<ActionsStepRule>({
+  const [{ throttle: formThrottle }] = (useFormData({
     form,
     watch: ['throttle'],
-  }) as unknown) as [ActionsStepRule];
+  }) as unknown) as [Partial<ActionsStepRule>];
+  const throttle = formThrottle || initialState.throttle;
 
   const handleSubmit = useCallback(
     (enabled: boolean) => {