diff --git a/src/stores/loads.js b/src/stores/loads.js
index 34aa08d..9b7d2f7 100644
--- a/src/stores/loads.js
+++ b/src/stores/loads.js
@@ -1,7 +1,6 @@
 import { defineStore } from "pinia";
 import { ref } from "vue";
 import api from "../lib/axios";
-import { getCalendar } from "../services/company";
 
 export const useLoadsStore = defineStore('load', () => {
 
@@ -97,9 +96,15 @@ export const useLoadsStore = defineStore('load', () => {
             const endpoint = `/v1/loads/new`;
             const {data} = await api.post(endpoint, load);
             loadsTotal.value++;
-            return data;
+            return {
+                msg: 'success',
+                data: data,
+            };
         } catch (error) {
-            return null;
+            return {
+                msg: error?.response?.data?.error?.message || 'No se pudo guardar carga, intente más tarde',
+                data: null,
+            };
         }
     }
 
@@ -127,9 +132,15 @@ export const useLoadsStore = defineStore('load', () => {
         try {
             const endpoint = `/v1/loads/${loadId}`;
             const {data} = await api.patch(endpoint, load);
-            return data;
+            return {
+                msg: 'success',
+                data,
+            };
         } catch (error) {
-            return null;
+            return {
+                msg: error?.response?.data?.error?.message || 'No se pudo publicar carga, intente más tarde',
+                data: null,
+            };
         }
     }
 
diff --git a/src/views/loads/modals/FormLoadModal.vue b/src/views/loads/modals/FormLoadModal.vue
index f73cd96..06a2706 100644
--- a/src/views/loads/modals/FormLoadModal.vue
+++ b/src/views/loads/modals/FormLoadModal.vue
@@ -223,8 +223,8 @@
         const hours = currentDate.getHours().toString().padStart(2, '0');
         const minutes = currentDate.getMinutes().toString().padStart(2, '0');
         const seconds = currentDate.getSeconds().toString().padStart(2, '0');
-        const startDate = formLoad.dateLoad === "" ? "" : new Date(`${formLoad.dateLoad}T${hours}:${minutes}:${seconds}`).toISOString();
-        const endDate = formLoad.dateDownload === "" ? "" : new Date(`${formLoad.dateDownload}T${hours}:${minutes}:${seconds}`).toISOString();
+        const startDate = formLoad.dateLoad === "" ? null : new Date(`${formLoad.dateLoad}T${hours}:${minutes}:${seconds}`).toISOString();
+        const endDate = formLoad.dateDownload === "" ? null : new Date(`${formLoad.dateDownload}T${hours}:${minutes}:${seconds}`).toISOString();
         let loadData = {
 			actual_cost: formLoad.price,
 			truck_type: formLoad.truckType?.meta_value || null,
@@ -281,23 +281,23 @@
                 vehicle: loadStore?.currentLoad?.vehicle || null,
                 driver: loadStore?.currentLoad?.driver || null,
             };
-            if(resp) {
+            if(resp.msg === 'success') {
                 const index = loadStore.loads.findIndex((load) => load._id === resp._id);
                 loadStore.loads[index] = {
                     ...loadStore.loads[index],
-                    ...resp,
+                    ...resp.data,
                     ...dataLocal,
                 };
                 return 'success';
             } else {
-                return 'error';
+                return resp.msg;
             }
 		} else{
             const resp = await loadStore.saveLoad(loadData);
             isLoading.value = false;
-            if(resp) {
+            if(resp.msg === 'success') {
                 const load = {
-                    ...resp,
+                    ...resp.data,
                     ...loadData,
                     categories: [loadData.categories],
                     origin_warehouse: locationLoadSelected.value,
@@ -307,7 +307,7 @@
                 loadStore.loads.unshift(load);
                 return 'success';
             } else {
-                return 'error';
+                return resp.msg;
             }
 		}
     }
@@ -323,7 +323,7 @@
         } else {
             Swal.fire({
                 title: "Error!",
-                text: t('loads.msgNotSave'),
+                text: resp,
                 icon: "error"
             });
         }
@@ -611,17 +611,16 @@
                 <div v-else class="btns-footer">
                     <button 
                         type="button" 
-                        class="btn btn-dark" 
+                        class="btn btn-danger" 
                         @click="clearLoad"
                         data-dismiss="modal">{{ t('buttons.close') }}</button>
                     <button 
                         type="button" 
                         class="btn btn-dark" 
-                        :class="[loadStore.currentLoad?.status !== 'Draft' ? 'btn-primary-sm radius-sm' : '']"
                         @click="handleSave"
                     >{{ t('buttons.save') }}</button>
                     <button 
-                        v-if="loadStore.currentLoad?.status === 'Draft'"
+                        v-if="loadStore?.currentLoad == null || loadStore.currentLoad?.status === 'Draft'"
                         type="submit" 
                         @click.prevent="handlePostLoad"
                         class="btn-primary-sm radius-sm"