diff --git a/app/components/app/equipment/entry-form.vue b/app/components/app/equipment/entry-form.vue
index 80cafba6..bb2b0545 100644
--- a/app/components/app/equipment/entry-form.vue
+++ b/app/components/app/equipment/entry-form.vue
@@ -15,11 +15,12 @@ interface Props {
   schema: z.ZodSchema<any>
   uoms: any[]
   values: any
+  isLoading?: boolean
   isReadonly?: boolean
 }
 
-const isLoading = ref(false)
 const props = defineProps<Props>()
+const isLoading = props.isLoading !== undefined ? props.isLoading : false
 const isReadonly = props.isReadonly !== undefined ? props.isReadonly : false
 const emit = defineEmits<{
   submit: [values: MaterialFormData, resetForm: () => void]
diff --git a/app/components/app/tools/entry-form.vue b/app/components/app/tools/entry-form.vue
index f12128eb..4354b36d 100644
--- a/app/components/app/tools/entry-form.vue
+++ b/app/components/app/tools/entry-form.vue
@@ -15,11 +15,12 @@ interface Props {
   schema: z.ZodSchema<any>
   uoms: any[]
   values: any
+  isLoading?: boolean
   isReadonly?: boolean
 }
 
-const isLoading = ref(false)
 const props = defineProps<Props>()
+const isLoading = props.isLoading !== undefined ? props.isLoading : false
 const isReadonly = props.isReadonly !== undefined ? props.isReadonly : false
 const emit = defineEmits<{
   submit: [values: DeviceFormData, resetForm: () => void]