diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 61315e55a..3842ff947 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -136,7 +136,8 @@ onMounted(async () => {
 
     if (!$props.formInitialData) {
         if ($props.autoLoad && $props.url) await fetch();
-        else if (arrayData.store.data) updateAndEmit('onFetch', arrayData.store.data);
+        else if (arrayData.store.data)
+            updateAndEmit('onFetch', { val: arrayData.store.data });
     }
     if ($props.observeFormChanges) {
         watch(
@@ -156,7 +157,7 @@ onMounted(async () => {
 if (!$props.url)
     watch(
         () => arrayData.store.data,
-        (val) => updateAndEmit('onFetch', val),
+        (val) => updateAndEmit('onFetch', { val }),
     );
 
 watch(
@@ -194,7 +195,7 @@ async function fetch() {
         });
         if (Array.isArray(data)) data = data[0] ?? {};
 
-        updateAndEmit('onFetch', data);
+        updateAndEmit('onFetch', { val: data });
     } catch (e) {
         state.set(modelValue, {});
         originalData.value = {};
@@ -222,7 +223,11 @@ async function save() {
 
         if ($props.urlCreate) notify('globals.dataCreated', 'positive');
 
-        updateAndEmit('onDataSaved', formData.value, response?.data, originalData.value);
+        updateAndEmit('onDataSaved', {
+            val: formData.value,
+            res: response?.data,
+            old: originalData.value,
+        });
         if ($props.reload) await arrayData.fetch({});
         hasChanges.value = false;
     } finally {
@@ -236,7 +241,7 @@ async function saveAndGo() {
 }
 
 function reset() {
-    updateAndEmit('onFetch', originalData.value);
+    updateAndEmit('onFetch', { val: originalData.value });
     if ($props.observeFormChanges) {
         hasChanges.value = false;
         isResetting.value = true;
@@ -258,7 +263,7 @@ function filter(value, update, filterOptions) {
     );
 }
 
-function updateAndEmit(evt, val, res, old) {
+function updateAndEmit(evt, { val, res, old } = { val: null, res: null, old: null }) {
     state.set(modelValue, val);
     originalData.value = val && JSON.parse(JSON.stringify(val));
     if (!$props.url) arrayData.store.data = val;