diff --git a/packages/react-formio-container/src/hooks/useForm.hook.ts b/packages/react-formio-container/src/hooks/useForm.hook.ts
index fbab9020..5a44c4b7 100644
--- a/packages/react-formio-container/src/hooks/useForm.hook.ts
+++ b/packages/react-formio-container/src/hooks/useForm.hook.ts
@@ -11,7 +11,8 @@ import {
   selectAuth,
   selectError,
   selectForm,
-  selectRoot
+  selectRoot,
+  oneOfIsActive
 } from "@tsed/react-formio";
 import { push } from "connected-react-router";
 import noop from "lodash/noop";
@@ -52,6 +53,7 @@ export function useForm(props: UseFormProps) {
   const auth: AuthState = useSelector(selectAuth);
   const error = useSelector((state) => selectError(type, state));
   const form = useSelector((state) => selectForm(type, state));
+  const isActive = useSelector(oneOfIsActive(type));
 
   if (form && (!form.tags || !form.tags.length) && formAction === "create") {
     form.tags = [...(parameters?.query?.tags || [])];
@@ -183,6 +185,7 @@ export function useForm(props: UseFormProps) {
 
   return {
     ...props,
+    isActive,
     basePath,
     formId,
     formAction,
diff --git a/packages/react-formio-container/src/hooks/useSubmission.hook.tsx b/packages/react-formio-container/src/hooks/useSubmission.hook.tsx
index a4b89ec3..2f81d58b 100644
--- a/packages/react-formio-container/src/hooks/useSubmission.hook.tsx
+++ b/packages/react-formio-container/src/hooks/useSubmission.hook.tsx
@@ -2,16 +2,17 @@ import {
   deleteSubmission,
   getSubmission as getSubmissionAction,
   getSubmissions,
+  oneOfIsActive,
   receiveForm,
   refreshSubmissions,
   saveSubmission as saveSubmissionAction,
   selectAuth,
   selectError,
   selectForm,
+  selectIsActive,
   selectRoot,
   selectSubmission,
-  Submission,
-  selectIsActive
+  Submission
 } from "@tsed/react-formio";
 import { push } from "connected-react-router";
 import noop from "lodash/noop";
@@ -52,7 +53,9 @@ export function useSubmission(props: UseSubmissionProps) {
     selectSubmission(submissionType, state as any)
   );
 
-  const isActive = useSelector((state) => selectIsActive(type, state));
+  const isActive = useSelector(oneOfIsActive(submissionType, formType, type));
+
+  useSelector((state) => selectIsActive(submissionType, state));
 
   const url = useSelector(
     (state) =>
diff --git a/packages/react-formio-container/src/views/form.view.tsx b/packages/react-formio-container/src/views/form.view.tsx
index 9141b2bd..f9d177d6 100644
--- a/packages/react-formio-container/src/views/form.view.tsx
+++ b/packages/react-formio-container/src/views/form.view.tsx
@@ -1,4 +1,4 @@
-import { Alert, Tabs, RemoveModal } from "@tsed/react-formio";
+import { Alert, Tabs, RemoveModal, Loader } from "@tsed/react-formio";
 import React from "react";
 import { Route, Switch, useParams } from "react-router";
 import { FormEditView } from "./formEdit.view";
@@ -16,10 +16,12 @@ function FormComponent({ className, ...props }: ReturnType<typeof useForm>) {
     setCurrentRoute,
     routes,
     gotoEdit,
-    i18n
+    i18n,
+    isActive
   } = props;
 
   const RemoveModalComponent = props.RemoveModalComponent || RemoveModal;
+  const LoaderComponent = props.LoaderComponent || Loader;
 
   return (
     <div>
@@ -78,6 +80,7 @@ function FormComponent({ className, ...props }: ReturnType<typeof useForm>) {
               />
             </Route>
           </Switch>
+          <LoaderComponent isActive={isActive} />
         </Tabs>
       </div>
     </div>
diff --git a/packages/react-formio-container/src/views/formSettings.view.tsx b/packages/react-formio-container/src/views/formSettings.view.tsx
index f31a3e19..35739a80 100644
--- a/packages/react-formio-container/src/views/formSettings.view.tsx
+++ b/packages/react-formio-container/src/views/formSettings.view.tsx
@@ -7,7 +7,7 @@ export function FormSettingsView(props: ReturnType<typeof useForm>) {
   const { form, saveForm, i18n } = props;
 
   return (
-    <div className={"p-3 pb-1"}>
+    <div className={"p-3"}>
       <Component
         {...props}
         form={form}
diff --git a/packages/react-formio-container/src/views/submission.view.tsx b/packages/react-formio-container/src/views/submission.view.tsx
index e81d7d45..42118f1a 100644
--- a/packages/react-formio-container/src/views/submission.view.tsx
+++ b/packages/react-formio-container/src/views/submission.view.tsx
@@ -50,7 +50,6 @@ export function SubmissionComponent(props: ReturnType<typeof useSubmission>) {
 
   return (
     <div className={"p-4 relative"}>
-      <LoaderComponent isActive={isActive} />
       <h2
         className={
           "border-b-1 border-gray-300 text-lg mb-4 pb-1 flex items-center"
@@ -104,6 +103,8 @@ export function SubmissionComponent(props: ReturnType<typeof useSubmission>) {
           onClose={gotoEdit}
         />
       )}
+
+      <LoaderComponent isActive={isActive} />
     </div>
   );
 }
diff --git a/packages/react-formio/src/components/form-access/formAccess.component.tsx b/packages/react-formio/src/components/form-access/formAccess.component.tsx
index 51979c2b..fc308c5c 100644
--- a/packages/react-formio/src/components/form-access/formAccess.component.tsx
+++ b/packages/react-formio/src/components/form-access/formAccess.component.tsx
@@ -3,17 +3,19 @@ import React, {
   PropsWithChildren,
   ReactElement,
   useCallback,
+  useEffect,
   useMemo,
   useState
 } from "react";
 import { FormOptions, FormSchema, Submission } from "../../interfaces";
 import { Card } from "../card/card.component";
-import { Form } from "../form/form.component";
+import { ChangedSubmission, Form } from "../form/form.component";
 import {
   AccessRoles,
   dataAccessToSubmissions,
   FormAccessSchema,
   getFormAccess,
+  shouldUpdate,
   SubmissionAccess,
   submissionsToDataAccess,
   updateSubmissions
@@ -46,6 +48,18 @@ function useFormAccess({
     [submissions]
   );
 
+  useEffect(() => {
+    const input = dataAccessToSubmissions(formDefinition, form);
+    if (formDefinition?._id) {
+      if (
+        shouldUpdate("access", submissions.access, input) ||
+        shouldUpdate("submissionAccess", submissions.submissionAccess, input)
+      ) {
+        setSubmissions(input);
+      }
+    }
+  }, [formDefinition?._id]);
+
   return {
     options,
     form,
@@ -80,18 +94,26 @@ function NamedFormAccess({
   onSubmit,
   children
 }: PropsWithChildren<NamedFormAccessProps>) {
+  const [isValid, setIsValid] = useState(true);
+
   return (
     <>
       <Form
+        name={name}
         form={form[name]}
         submission={submissions[name]}
-        onChange={(submission: Submission<AccessRoles>) => {
-          onChange(name, submission);
+        onChange={({ data, isValid }: ChangedSubmission<AccessRoles>) => {
+          isValid && onChange(name, { data });
+          setIsValid(isValid);
         }}
         options={options}
       />
 
-      <button className={"mt-5 btn btn-primary"} onClick={onSubmit}>
+      <button
+        disabled={!isValid}
+        className={"mt-5 btn btn-primary"}
+        onClick={onSubmit}
+      >
         Save access
       </button>
 
diff --git a/packages/react-formio/src/components/form-builder/formBuilder.component.tsx b/packages/react-formio/src/components/form-builder/formBuilder.component.tsx
index d06b3ea1..e117a6d2 100755
--- a/packages/react-formio/src/components/form-builder/formBuilder.component.tsx
+++ b/packages/react-formio/src/components/form-builder/formBuilder.component.tsx
@@ -40,7 +40,7 @@ async function createBuilder(
   };
 
   try {
-    const builder = await new FormioFormBuilder(el, form, options).ready;
+    const builder = await new FormioFormBuilder(el, form, { ...options }).ready;
 
     const handleEvent = (event: string) => {
       return (...args: any[]) => {
diff --git a/packages/react-formio/src/components/form-settings/formSettings.component.spec.tsx b/packages/react-formio/src/components/form-settings/formSettings.component.spec.tsx
index 378b1e94..6c725b9c 100644
--- a/packages/react-formio/src/components/form-settings/formSettings.component.spec.tsx
+++ b/packages/react-formio/src/components/form-settings/formSettings.component.spec.tsx
@@ -12,7 +12,13 @@ describe("FormSettings", () => {
     Sandbox.args.form.action = "https://test";
 
     const { getByTestId } = render(
-      <Sandbox {...Sandbox.args} onSubmit={onSubmit} />
+      <Sandbox
+        {...Sandbox.args}
+        onSubmit={onSubmit}
+        options={{
+          i18n: (f: string) => f + " i18N"
+        }}
+      />
     );
 
     const btn = getByTestId("submit");
@@ -52,8 +58,6 @@ describe("FormSettings", () => {
       <FormSettings
         {...Sandbox.args}
         options={{
-          template: "tailwind",
-          iconset: "bx",
           i18n: (f: string) => f + " i18N"
         }}
       />
diff --git a/packages/react-formio/src/components/form-settings/formSettings.component.tsx b/packages/react-formio/src/components/form-settings/formSettings.component.tsx
index 5a651900..1b87962a 100644
--- a/packages/react-formio/src/components/form-settings/formSettings.component.tsx
+++ b/packages/react-formio/src/components/form-settings/formSettings.component.tsx
@@ -1,10 +1,10 @@
-import React, { useCallback, useState } from "react";
-import { FormOptions, FormSchema, Submission } from "../../interfaces";
+import React, { useCallback, useEffect, useState } from "react";
+import { FormOptions, FormSchema } from "../../interfaces";
 import { getFormSettingsSchema } from "./formSettings.schema";
-import { Form } from "../form/form.component";
+import { ChangedSubmission, Form } from "../form/form.component";
 import {
-  formSettingsToSubmission,
   FormSettingsSchema,
+  formSettingsToSubmission,
   submissionToFormSettings
 } from "./formSettings.utils";
 import isEqual from "lodash/isEqual";
@@ -22,25 +22,36 @@ function useFormSettings({
   options
 }: FormSettingsProps) {
   const form = getFormSettingsSchema();
+  const [isValid, setIsValid] = useState(true);
   const [submission, setSubmission] = useState(() =>
     formSettingsToSubmission(formDefinition)
   );
 
   const onChange = useCallback(
-    (newSubmission: Submission<FormSettingsSchema>) => {
-      if (!isEqual(submission.data, newSubmission.data)) {
-        setSubmission(newSubmission);
+    ({ data, isValid }: ChangedSubmission<FormSettingsSchema>) => {
+      if (isValid) {
+        setSubmission({ data });
       }
+      setIsValid(isValid);
     },
     [submission]
   );
 
+  useEffect(() => {
+    const input = formSettingsToSubmission(formDefinition);
+    if (formDefinition?._id && !isEqual(submission.data, input.data)) {
+      setSubmission(input);
+    }
+  }, [formDefinition?._id]);
+
   return {
     options,
     form,
     type: formDefinition.type,
     submission,
     onChange,
+    isValid,
+    setIsValid,
     onSubmit: () => {
       onSubmit(submissionToFormSettings(formDefinition, submission));
     }
@@ -53,7 +64,8 @@ export function FormSettings(props: FormSettingsProps) {
     submission,
     options = {},
     onChange,
-    onSubmit
+    onSubmit,
+    isValid
   } = useFormSettings(props);
 
   const i18n = options.i18n || ((f: string) => f);
@@ -69,6 +81,7 @@ export function FormSettings(props: FormSettingsProps) {
 
       <button
         data-testid='submit'
+        disabled={!isValid}
         className={"mt-5 btn btn-primary"}
         onClick={onSubmit}
       >
diff --git a/packages/react-formio/src/components/form-settings/formSettings.stories.tsx b/packages/react-formio/src/components/form-settings/formSettings.stories.tsx
index 8b8b2576..a043eec2 100644
--- a/packages/react-formio/src/components/form-settings/formSettings.stories.tsx
+++ b/packages/react-formio/src/components/form-settings/formSettings.stories.tsx
@@ -29,9 +29,7 @@ export default {
 export const Sandbox = (args: any) => {
   // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
   // @ts-ignore
-  return (
-    <FormSettings {...args} options={{ template: "tailwind", iconset: "bx" }} />
-  );
+  return <FormSettings {...args} />;
 };
 
 Sandbox.args = {
diff --git a/packages/react-formio/src/components/form/form.component.tsx b/packages/react-formio/src/components/form/form.component.tsx
index b985e790..61ef07f8 100755
--- a/packages/react-formio/src/components/form/form.component.tsx
+++ b/packages/react-formio/src/components/form/form.component.tsx
@@ -1,4 +1,3 @@
-import { EventEmitter2 } from "eventemitter2";
 import AllComponents from "formiojs/components";
 import Components from "formiojs/components/Components";
 import PropTypes from "prop-types";
@@ -8,23 +7,25 @@ import { useForm } from "./useForm.hook";
 
 Components.setComponents(AllComponents);
 
-const getDefaultEmitter = (): EventEmitter2 => {
-  return new EventEmitter2({
-    wildcard: false,
-    maxListeners: 0
-  });
-};
+export interface ChangedSubmission<T = any> extends Submission<T> {
+  changed: any;
+  isValid: boolean;
+}
 
 export interface FormProps {
-  className: string;
+  name?: string;
+  /**
+   *
+   */
+  className?: string;
   /**
    *
    */
-  src: string;
+  src?: string;
   /**
    * url to fetch form
    */
-  url: string;
+  url?: string;
   /**
    * Raw form object
    */
@@ -32,47 +33,45 @@ export interface FormProps {
   /**
    * Data submission
    */
-  submission: Submission;
+  submission?: Submission;
   /**
    * Configuration option
    */
-  options: FormOptions;
-  onPrevPage: Function;
-  onNextPage: Function;
-  onCancel: Function;
-  onChange: Function;
-  onCustomEvent: Function;
-  onComponentChange: Function;
-  onSubmit: Function;
-  onSubmitDone: Function;
-  onFormLoad: Function;
-  onError: Function;
-  onRender: Function;
-  onAttach: Function;
-  onBuild: Function;
-  onFocus: Function;
-  onBlur: Function;
-  onInitialized: Function;
-  onFormReady: (formio: any) => void;
-  formioform: any;
+  options?: FormOptions;
+  onPrevPage?: Function;
+  onNextPage?: Function;
+  onCancel?: Function;
+  onChange?: (submission: ChangedSubmission) => void;
+  onCustomEvent?: Function;
+  onComponentChange?: Function;
+  onSubmit?: Function;
+  onSubmitDone?: Function;
+  onFormLoad?: Function;
+  onError?: Function;
+  onRender?: Function;
+  onAttach?: Function;
+  onBuild?: Function;
+  onFocus?: Function;
+  onBlur?: Function;
+  onInitialized?: Function;
+  onFormReady?: (formio: any) => void;
+  formioform?: any;
 }
 
 export function Form(props: Partial<FormProps>) {
-  const { element } = useForm({
-    ...props,
-    getDefaultEmitter: Form.getDefaultEmitter
-  });
+  const { element } = useForm(props);
 
   return (
     <div
-      data-testid={"formioContainer"}
-      ref={(el): any => (element.current = el)}
+      data-testid={"formioContainer" + (props.name || "")}
+      ref={element}
       className={props.className}
     />
   );
 }
 
 Form.propTypes = {
+  name: PropTypes.string,
   className: PropTypes.string,
   /**
    *
@@ -98,8 +97,7 @@ Form.propTypes = {
     noAlerts: PropTypes.bool,
     i18n: PropTypes.any,
     template: PropTypes.string,
-    saveDraft: PropTypes.bool,
-    events: PropTypes.any
+    saveDraft: PropTypes.bool
   }),
   onPrevPage: PropTypes.func,
   onNextPage: PropTypes.func,
@@ -120,5 +118,3 @@ Form.propTypes = {
   onFormReady: PropTypes.func,
   formioform: PropTypes.any
 };
-
-Form.getDefaultEmitter = getDefaultEmitter;
diff --git a/packages/react-formio/src/components/form/useForm.hook.ts b/packages/react-formio/src/components/form/useForm.hook.ts
index 70644a7e..dfb02fa6 100644
--- a/packages/react-formio/src/components/form/useForm.hook.ts
+++ b/packages/react-formio/src/components/form/useForm.hook.ts
@@ -1,143 +1,116 @@
 import FormioForm from "formiojs/Form";
+import { get } from "lodash";
 import cloneDeep from "lodash/cloneDeep";
 import isEqual from "lodash/isEqual";
 import { useEffect, useRef } from "react";
 import { callLast } from "../../utils/callLast";
 
-export const useForm = ({
-  src,
-  form,
-  options = {},
-  submission,
-  url,
-  getDefaultEmitter,
-  ...props
-}: any): any => {
+export const useForm = (props: any): any => {
+  const { src, form, options = {}, submission, url, ...funcs } = props;
   const element = useRef<any>();
-  const formio = useRef<any>();
+  const isLoaded = useRef<boolean>();
   const instance = useRef<any>();
-  const lastChange = useRef<any>(null);
-  const isLoaded = useRef<any>(false);
   const events = useRef<Map<string, any>>(new Map());
 
-  useEffect(
-    () => () => {
-      isLoaded.current = false;
-      if (formio.current) {
-        formio.current.destroy(true);
-      }
-      formio.current = null;
-    },
-    [formio]
-  );
+  const createWebForm = (srcOrForm: any, options: any) => {
+    options = Object.assign({}, options);
+    srcOrForm =
+      typeof srcOrForm === "string" ? srcOrForm : cloneDeep(srcOrForm);
 
-  const onAnyEvent = (event: string, ...args: any[]): void => {
-    if (event.startsWith("formio.")) {
-      const funcName = `on${event.charAt(7).toUpperCase()}${event.slice(8)}`;
+    if (!instance.current) {
+      instance.current = new FormioForm(element.current, srcOrForm, options);
 
-      if (funcName === "onChange") {
-        if (!isLoaded.current || isEqual(args[0]?.data, lastChange.current)) {
+      instance.current.onAny((event: string, ...args: any[]): void => {
+        if (!instance.current) {
           return;
         }
 
-        lastChange.current = cloneDeep(args[0].data);
-      }
-
-      if (
-        // eslint-disable-next-line no-prototype-builtins
-        props.hasOwnProperty(funcName) &&
-        typeof props[funcName] === "function"
-      ) {
-        if (!events.current.has(funcName)) {
-          const fn = callLast(props[funcName], 100);
-          events.current.set(funcName, fn);
+        if (event.startsWith("formio.")) {
+          const funcName = `on${event.charAt(7).toUpperCase()}${event.slice(
+            8
+          )}`;
+
+          if (funcName === "onChange") {
+            if (isEqual(get(submission, "data"), args[0].data)) {
+              return;
+            }
+          }
+
+          if (
+            // eslint-disable-next-line no-prototype-builtins
+            props.hasOwnProperty(funcName) &&
+            typeof funcs[funcName] === "function"
+          ) {
+            if (!events.current.has(funcName)) {
+              const fn = callLast(funcs[funcName], 100);
+              events.current.set(funcName, fn);
+            }
+            events.current.get(funcName)(...args);
+          }
         }
-        events.current.get(funcName)(...args);
-      }
-    }
-  };
-
-  const initializeFormio = (): void => {
-    if (instance.current && instance.current.ready) {
-      if (formio.current && submission) {
-        formio.current.submission = submission;
-      }
-
-      instance.current.onAny(onAnyEvent);
-    }
-  };
-
-  const createWebFormInstance = async (srcOrForm: any): Promise<any> => {
-    const { formioform, onFormReady } = props;
-    if (instance.current) {
-      formio.current = await instance.current.ready;
-
-      return formio.current;
-    }
-
-    instance.current = new (formioform || FormioForm)(
-      element.current,
-      srcOrForm,
-      options
-    );
-
-    initializeFormio();
+      });
 
-    const formioInstance = await instance.current.ready;
-    formio.current = formioInstance;
+      instance.current.ready.then((formio: any) => {
+        submission && (formio.submission = submission);
 
-    if (onFormReady) {
-      onFormReady(formioInstance);
-    }
+        if (props.onFormReady) {
+          props.onFormReady(formio);
+        }
 
-    if (submission) {
-      lastChange.current = cloneDeep(submission?.data);
-      formio.current.submission = submission;
+        isLoaded.current = true;
+      });
     }
 
-    return formio.current;
+    return instance.current;
   };
 
   useEffect(() => {
-    if (src) {
-      createWebFormInstance(src).then((formio) => {
-        formio.src = src;
-        isLoaded.current = true;
-        return formio;
+    if (instance.current) {
+      instance.current.ready.then((formio: any) => {
+        submission && (formio.submission = submission);
       });
     }
-  }, [src]);
+  }, [submission]);
 
   useEffect(() => {
-    if (form) {
-      createWebFormInstance(form).then((formio) => {
+    if (form && instance.current) {
+      instance.current.ready.then((formio: any) => {
         formio.form = form;
-
         if (url) {
           formio.url = url;
         }
-
-        isLoaded.current = true;
-
-        return formio;
       });
     }
-  }, [form]);
+  }, [form, url]);
 
   useEffect(() => {
-    const { events } = options || {};
-    if (!events) {
-      // eslint-disable-next-line @typescript-eslint/no-use-before-define
-      options.events = getDefaultEmitter();
+    if (src) {
+      if (instance.current) {
+        isLoaded.current = false;
+        instance.current.destroy(true);
+      }
+
+      createWebForm(src, options).then((formio: any) => {
+        formio.form = form;
+        if (url) {
+          formio.url = url;
+        }
+      });
     }
-  }, [options]);
+  }, [src]);
 
   useEffect(() => {
-    if (formio.current && submission) {
-      lastChange.current = cloneDeep(submission?.data);
-      formio.current.submission = submission;
-    }
-  }, [submission]);
+    isLoaded.current = false;
+
+    const builder = createWebForm(form || src, options);
 
-  return { element };
+    return () => {
+      isLoaded.current = false;
+      builder.destroy(true);
+    };
+  }, []);
+
+  return {
+    element
+  };
 };
diff --git a/packages/react-formio/src/components/loader/loader.component.tsx b/packages/react-formio/src/components/loader/loader.component.tsx
index b0b7f2c8..8b166eb6 100644
--- a/packages/react-formio/src/components/loader/loader.component.tsx
+++ b/packages/react-formio/src/components/loader/loader.component.tsx
@@ -16,19 +16,23 @@ export function Loader({
   icon = "radio-circle",
   className = ""
 }: LoaderProps) {
-  return (
-    <div className={classnames("opacity-85 z-20 relative", className)}>
-      {isActive && (
-        <div className='flex items-center justify-center p-5 absolute top-0 right-0 left-0 bottom-0 bg-white'>
-          <span
-            data-testid={"icon"}
-            color={color}
-            className={`text-11xl ${iconClass(undefined, icon, true)}`}
-          />
-        </div>
-      )}
-    </div>
-  );
+  if (isActive) {
+    return (
+      <div
+        className={classnames(
+          "opacity-85 z-20 flex items-center justify-center p-5 absolute top-0 right-0 left-0 bottom-0 bg-white",
+          className
+        )}
+      >
+        <span
+          data-testid={"icon"}
+          color={color}
+          className={`text-11xl ${iconClass(undefined, icon, true)}`}
+        />
+      </div>
+    );
+  }
+  return null;
 }
 
 Loader.propTypes = {
diff --git a/packages/react-formio/src/interfaces/Submission.ts b/packages/react-formio/src/interfaces/Submission.ts
index f73d45ba..fe7b5359 100644
--- a/packages/react-formio/src/interfaces/Submission.ts
+++ b/packages/react-formio/src/interfaces/Submission.ts
@@ -1,4 +1,5 @@
 export interface Submission<T = any> extends Record<string, unknown> {
   _id?: string;
   data: T;
+  metadata?: any;
 }
diff --git a/packages/react-formio/src/stores/form/form.reducers.ts b/packages/react-formio/src/stores/form/form.reducers.ts
index ffff37ab..ab188aee 100755
--- a/packages/react-formio/src/stores/form/form.reducers.ts
+++ b/packages/react-formio/src/stores/form/form.reducers.ts
@@ -54,8 +54,10 @@ export const formReducer = createReducer<FormState>(
       error: payload.error,
       isActive: false
     }),
-    [sendForm.toString()]: (state) => ({
+    [sendForm.toString()]: (state, { form, url }) => ({
       ...state,
+      data: form,
+      url,
       isActive: true
     })
   },
diff --git a/packages/react-formio/src/stores/submission/submission.reducers.spec.ts b/packages/react-formio/src/stores/submission/submission.reducers.spec.ts
index 81417ec9..a458ec51 100644
--- a/packages/react-formio/src/stores/submission/submission.reducers.spec.ts
+++ b/packages/react-formio/src/stores/submission/submission.reducers.spec.ts
@@ -50,6 +50,7 @@ describe("Submission reducers", () => {
     const state: any = {};
     const payload = {
       formId: "formId",
+      submission: {},
       id: "id",
       url: "url"
     };
diff --git a/packages/react-formio/src/stores/submission/submission.reducers.ts b/packages/react-formio/src/stores/submission/submission.reducers.ts
index 8664b7f7..1b1cf120 100755
--- a/packages/react-formio/src/stores/submission/submission.reducers.ts
+++ b/packages/react-formio/src/stores/submission/submission.reducers.ts
@@ -44,12 +44,15 @@ export const submissionReducer = createReducer<SubmissionState>(
       data: {},
       isActive: true
     }),
-    [sendSubmission.toString()]: (state: any, { formId, id, url }: any) => ({
+    [sendSubmission.toString()]: (
+      state: any,
+      { formId, submission, id, url }: any
+    ) => ({
       ...state,
       formId,
       id,
       url: url || state.url,
-      data: {},
+      data: submission,
       isActive: true
     }),
     [receiveSubmission.toString()]: (state: any, { submission, url }: any) => ({