diff --git a/src/components/form/fields/DescriptionField.tsx b/src/components/form/fields/DescriptionField.tsx
index 629ad075..40c695f5 100644
--- a/src/components/form/fields/DescriptionField.tsx
+++ b/src/components/form/fields/DescriptionField.tsx
@@ -1,5 +1,5 @@
 import i18n from '@dhis2/d2-i18n'
-import { TextAreaFieldFF } from '@dhis2/ui'
+import { createMaxCharacterLength, TextAreaFieldFF } from '@dhis2/ui'
 import React from 'react'
 import { Field as FieldRFF } from 'react-final-form'
 import { SchemaSection, useCheckMaxLengthFromSchema } from '../../../lib'
@@ -11,10 +11,7 @@ export function DescriptionField({
     helpText?: string
     schemaSection: SchemaSection
 }) {
-    const validate = useCheckMaxLengthFromSchema(
-        schemaSection.name,
-        'description'
-    )
+    const validate = createMaxCharacterLength(2000)
 
     return (
         <FieldRFF
diff --git a/src/pages/categories/form/categorySchema.ts b/src/pages/categories/form/categorySchema.ts
index 36a12a83..bd8ad288 100644
--- a/src/pages/categories/form/categorySchema.ts
+++ b/src/pages/categories/form/categorySchema.ts
@@ -1,8 +1,9 @@
 import { z } from 'zod'
 import { getDefaults, createFormValidate, modelFormSchemas } from '../../../lib'
 import { Category } from '../../../types/generated'
+import i18n from '@dhis2/d2-i18n'
 
-/*  Note that this describes what we send to the server, 
+/*  Note that this describes what we send to the server,
     and not what is stored in the form. */
 const { identifiable, referenceCollection, withAttributeValues } =
     modelFormSchemas
diff --git a/src/pages/organisationUnits/form/organisationUnitSchema.ts b/src/pages/organisationUnits/form/organisationUnitSchema.ts
index 8dcd4e2b..f4f97f1c 100644
--- a/src/pages/organisationUnits/form/organisationUnitSchema.ts
+++ b/src/pages/organisationUnits/form/organisationUnitSchema.ts
@@ -10,15 +10,7 @@ export const organisationUnitSchema = identifiable
     .extend({
         shortName: z.string().trim().default(''),
         code: z.string().trim().optional(),
-        description: z
-            .string()
-            .trim()
-            .max(2147483647, {
-                message: i18n.t('Should not exceed {{maxLength}} characters', {
-                    maxLength: 2147483647,
-                }),
-            })
-            .optional(),
+        description: z.string().trim().optional(),
         image: z.object({ id: z.string() }).optional(),
         phoneNumber: z
             .string()
@@ -50,9 +42,9 @@ export const organisationUnitSchema = identifiable
         closedDate: z.string().date().optional(),
         comment: z
             .string()
-            .max(2147483647, {
+            .max(2000, {
                 message: i18n.t('Should not exceed {{maxLength}} characters', {
-                    maxLength: 2147483647,
+                    maxLength: 2000,
                 }),
             })
             .optional(),