diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js
index 156d055e7..b4da69b62 100644
--- a/src/boot/qformMixin.js
+++ b/src/boot/qformMixin.js
@@ -44,7 +44,7 @@ export default {
                     return;
                 }
                 evt.preventDefault();
-                that.onSubmit({ ...evt, prevent: false });
+                that.onSubmit(false);
             }
         });
     },
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index dc9c42608..1f5cd518f 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -113,7 +113,7 @@ const defaultButtons = computed(() => ({
         color: 'primary',
         icon: 'save',
         label: 'globals.save',
-        click: () => myForm.value.onSubmit({ prevent: false }),
+        click: () => myForm.value.onSubmit(false),
         type: 'submit',
     },
     reset: {
@@ -207,7 +207,7 @@ async function fetch() {
     }
 }
 
-async function save({ prevent = true }) {
+async function save(prevent = true) {
     if (prevent) return;
     if ($props.observeFormChanges && !hasChanges.value)
         return notify('globals.noChanges', 'negative');
@@ -294,7 +294,7 @@ defineExpose({
         <QForm
             ref="myForm"
             v-if="formData"
-            @submit="save"
+            @submit="save(!!$event)"
             @reset="reset"
             class="q-pa-md"
             :style="maxWidth ? 'max-width: ' + maxWidth : ''"
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index 26f8716c2..f718b0d90 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -67,7 +67,7 @@ defineExpose({
                 <QBtn
                     :label="t('globals.save')"
                     :title="t('globals.save')"
-                    @click="formModelRef.save({ prevent: false })"
+                    @click="formModelRef.save(false)"
                     color="primary"
                     class="q-ml-sm"
                     :disabled="isLoading"
diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index 945ea027d..0b748bcac 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -304,7 +304,7 @@ async function getAmountPaid() {
                         :label="t('globals.save')"
                         :loading="formModelRef.isLoading"
                         color="primary"
-                        @click="formModelRef.save({ prevent: false })"
+                        @click="formModelRef.save(false)"
                     />
                 </div>
             </template>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index dfb89d632..b5b6b7fbf 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -52,7 +52,7 @@ function deleteFile(dmsFk) {
             invoiceInRef.value.formData.dmsFk = null;
             invoiceInRef.value.formData.dms = undefined;
             invoiceInRef.value.hasChanges = true;
-            invoiceInRef.value.save({ prevent: false });
+            invoiceInRef.value.save(false);
         });
 }
 </script>
@@ -281,7 +281,7 @@ function deleteFile(dmsFk) {
                     invoiceInRef.formData.dmsFk = dmsData.id;
                     invoiceInRef.formData.dms = dmsData;
                     invoiceInRef.hasChanges = true;
-                    invoiceInRef.save({ prevent: false });
+                    invoiceInRef.save(false);
                 }
             "
         />