diff --git a/packages/esm-bed-management-app/src/bed-administration/bed-administration-form.component.tsx b/packages/esm-bed-management-app/src/bed-administration/bed-administration-form.component.tsx
index fb19ab3e3..6b2803106 100644
--- a/packages/esm-bed-management-app/src/bed-administration/bed-administration-form.component.tsx
+++ b/packages/esm-bed-management-app/src/bed-administration/bed-administration-form.component.tsx
@@ -21,7 +21,7 @@ import {
   InlineNotification,
 } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import { type Location } from '@openmrs/esm-framework';
+import { getCoreTranslation, type Location } from '@openmrs/esm-framework';
 import type { BedType, BedFormData } from '../types';
 import { type BedAdministrationData } from './bed-administration-types';
 
@@ -119,7 +119,7 @@ const BedAdministrationForm: React.FC<BedAdministrationFormProps> = ({
     <ComposedModal open={showModal} onClose={() => onModalChange(false)} preventCloseOnClickOutside>
       <ModalHeader title={headerTitle} />
       <ModalBody hasScrollingContent>
-        <Form onSubmit={handleSubmit(onSubmit, onError)}>
+        <Form>
           <Stack gap={3}>
             <FormGroup legendText={''}>
               <Controller
@@ -279,7 +279,7 @@ const BedAdministrationForm: React.FC<BedAdministrationFormProps> = ({
       </ModalBody>
       <ModalFooter>
         <Button onClick={() => onModalChange(false)} kind="secondary">
-          {t('cancel', 'Cancel')}
+          {getCoreTranslation('cancel', 'Cancel')}
         </Button>
         <Button disabled={!isDirty} onClick={handleSubmit(onSubmit, onError)}>
           <span>{t('save', 'Save')}</span>
diff --git a/packages/esm-bed-management-app/src/bed-tag/bed-tags-admin-form.component.tsx b/packages/esm-bed-management-app/src/bed-tag/bed-tags-admin-form.component.tsx
index a5cf7985e..9722c9a24 100644
--- a/packages/esm-bed-management-app/src/bed-tag/bed-tags-admin-form.component.tsx
+++ b/packages/esm-bed-management-app/src/bed-tag/bed-tags-admin-form.component.tsx
@@ -15,7 +15,7 @@ import {
   InlineNotification,
 } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import { type Location } from '@openmrs/esm-framework';
+import { getCoreTranslation, type Location } from '@openmrs/esm-framework';
 import type { BedTagData } from '../types';
 
 const BedTagAdministrationSchema = z.object({
@@ -77,8 +77,8 @@ const BedTagsAdministrationForm: React.FC<BedTagAdministrationFormProps> = ({
   return (
     <ComposedModal open={showModal} onClose={() => onModalChange(false)} preventCloseOnClickOutside>
       <ModalHeader title={headerTitle} />
-      <Form onSubmit={handleSubmit(onSubmit, onError)}>
-        <ModalBody hasScrollingContent>
+      <ModalBody hasScrollingContent>
+        <Form>
           <Stack gap={3}>
             <FormGroup legendText={''}>
               <Controller
@@ -110,16 +110,16 @@ const BedTagsAdministrationForm: React.FC<BedTagAdministrationFormProps> = ({
               />
             )}
           </Stack>
-        </ModalBody>
-        <ModalFooter>
-          <Button onClick={() => onModalChange(false)} kind="secondary">
-            {t('cancel', 'Cancel')}
-          </Button>
-          <Button disabled={!isDirty} type="submit">
-            <span>{t('save', 'Save')}</span>
-          </Button>
-        </ModalFooter>
-      </Form>
+        </Form>
+      </ModalBody>
+      <ModalFooter>
+        <Button onClick={() => onModalChange(false)} kind="secondary">
+          {getCoreTranslation('cancel', 'Cancel')}
+        </Button>
+        <Button disabled={!isDirty} onClick={handleSubmit(onSubmit, onError)}>
+          <span>{t('save', 'Save')}</span>
+        </Button>
+      </ModalFooter>
     </ComposedModal>
   );
 };
diff --git a/packages/esm-bed-management-app/src/bed-type/bed-type-admin-form.component.tsx b/packages/esm-bed-management-app/src/bed-type/bed-type-admin-form.component.tsx
index fe7c1583d..83e2b4a40 100644
--- a/packages/esm-bed-management-app/src/bed-type/bed-type-admin-form.component.tsx
+++ b/packages/esm-bed-management-app/src/bed-type/bed-type-admin-form.component.tsx
@@ -16,7 +16,7 @@ import {
   InlineNotification,
 } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import { type Location } from '@openmrs/esm-framework';
+import { getCoreTranslation, type Location } from '@openmrs/esm-framework';
 import type { BedType, BedTypeData } from '../types';
 
 const BedTypeAdministrationSchema = z.object({
@@ -81,8 +81,8 @@ const BedTypeAdministrationForm: React.FC<BedAdministrationFormProps> = ({
   return (
     <ComposedModal open={showModal} onClose={() => onModalChange(false)} preventCloseOnClickOutside>
       <ModalHeader title={headerTitle} />
-      <Form onSubmit={handleSubmit(onSubmit, onError)}>
-        <ModalBody hasScrollingContent>
+      <ModalBody hasScrollingContent>
+        <Form>
           <Stack gap={3}>
             <FormGroup legendText={''}>
               <Controller
@@ -149,16 +149,16 @@ const BedTypeAdministrationForm: React.FC<BedAdministrationFormProps> = ({
               />
             )}
           </Stack>
-        </ModalBody>
-        <ModalFooter>
-          <Button onClick={() => onModalChange(false)} kind="secondary">
-            {t('cancel', 'Cancel')}
-          </Button>
-          <Button disabled={!isDirty} type="submit">
-            <span>{t('save', 'Save')}</span>
-          </Button>
-        </ModalFooter>
-      </Form>
+        </Form>
+      </ModalBody>
+      <ModalFooter>
+        <Button onClick={() => onModalChange(false)} kind="secondary">
+          {getCoreTranslation('cancel', 'Cancel')}
+        </Button>
+        <Button disabled={!isDirty} onClick={handleSubmit(onSubmit, onError)}>
+          <span>{t('save', 'Save')}</span>
+        </Button>
+      </ModalFooter>
     </ComposedModal>
   );
 };