diff --git a/src/pages/tasks/TaskDescriptionPage.js b/src/pages/tasks/TaskDescriptionPage.js
index 01ed7e55f8a0..7d35706484ff 100644
--- a/src/pages/tasks/TaskDescriptionPage.js
+++ b/src/pages/tasks/TaskDescriptionPage.js
@@ -6,7 +6,6 @@ import {withOnyx} from 'react-native-onyx';
 import ScreenWrapper from '../../components/ScreenWrapper';
 import HeaderWithBackButton from '../../components/HeaderWithBackButton';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
-import Form from '../../components/Form';
 import ONYXKEYS from '../../ONYXKEYS';
 import TextInput from '../../components/TextInput';
 import reportPropTypes from '../reportPropTypes';
@@ -21,6 +20,8 @@ import Navigation from '../../libs/Navigation/Navigation';
 import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
 import withCurrentUserPersonalDetails from '../../components/withCurrentUserPersonalDetails';
 import withReportOrNotFound from '../home/report/withReportOrNotFound';
+import FormProvider from '../../components/Form/FormProvider';
+import InputWrapper from '../../components/Form/InputWrapper';
 
 const propTypes = {
     /** Current user session */
@@ -88,7 +89,7 @@ function TaskDescriptionPage(props) {
         >
             <FullPageNotFoundView shouldShow={isTaskNonEditable}>
                 <HeaderWithBackButton title={props.translate('task.task')} />
-                <Form
+                <FormProvider
                     style={[styles.flexGrow1, styles.ph5]}
                     formID={ONYXKEYS.FORMS.EDIT_TASK_FORM}
                     validate={validate}
@@ -97,7 +98,8 @@ function TaskDescriptionPage(props) {
                     enabledWhenOffline
                 >
                     <View style={[styles.mb4]}>
-                        <TextInput
+                        <InputWrapper
+                            InputComponent={TextInput}
                             accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
                             inputID="description"
                             name="description"
@@ -117,7 +119,7 @@ function TaskDescriptionPage(props) {
                             textAlignVertical="top"
                         />
                     </View>
-                </Form>
+                </FormProvider>
             </FullPageNotFoundView>
         </ScreenWrapper>
     );