diff --git a/libs/portals/my-pages/health/src/screens/OrganDonation/OrganDonation.tsx b/libs/portals/my-pages/health/src/screens/OrganDonation/OrganDonation.tsx
index 7ef00c370fb5..f99e0cf5b1a0 100644
--- a/libs/portals/my-pages/health/src/screens/OrganDonation/OrganDonation.tsx
+++ b/libs/portals/my-pages/health/src/screens/OrganDonation/OrganDonation.tsx
@@ -43,8 +43,8 @@ const OrganDonation = () => {
       iAmOrganDonorWithExceptionsText: formatMessage(
         m.iAmOrganDonorWithExceptionsText,
       ),
-      iAmNotOrganDonorText: formatMessage(m.iAmOrganDonorText),
-      iAmOrganDonorText: formatMessage(m.iAmNotOrganDonorText),
+      iAmNotOrganDonorText: formatMessage(m.iAmNotOrganDonorText),
+      iAmOrganDonorText: formatMessage(m.iAmOrganDonorText),
       iAmOrganDonorWithExceptions: formatMessage(m.iAmOrganDonorWithExceptions),
       iAmOrganDonor: formatMessage(m.iAmOrganDonor),
       iAmNotOrganDonor: formatMessage(m.iAmNotOrganDonor),
diff --git a/libs/portals/my-pages/health/src/screens/OrganDonation/components/RegistrationForm.tsx b/libs/portals/my-pages/health/src/screens/OrganDonation/components/RegistrationForm.tsx
index 4b4db5a87fcf..f06005e5afae 100644
--- a/libs/portals/my-pages/health/src/screens/OrganDonation/components/RegistrationForm.tsx
+++ b/libs/portals/my-pages/health/src/screens/OrganDonation/components/RegistrationForm.tsx
@@ -87,7 +87,7 @@ export const OrganRegistrationForm = () => {
     const formData = new FormData(e.currentTarget)
     const data = Object.fromEntries(formData.entries())
     const idKey = 'selected-limitations-'
-    const otherLimitations = data['otherLimitatons'].toString()
+    const otherLimitations = data['otherLimitatons']?.toString()
     const limitations = Object.keys(data)
       .filter((key) => key.includes(idKey))
       .map((key) => key.replace(idKey, '').toLowerCase())