diff --git a/docs/3.x.x/en/plugin-development/ui-components.md b/docs/3.x.x/en/plugin-development/ui-components.md
index 8ef3baed59..4c621c5005 100644
--- a/docs/3.x.x/en/plugin-development/ui-components.md
+++ b/docs/3.x.x/en/plugin-development/ui-components.md
@@ -534,10 +534,8 @@ Component integrates Label, InputText, InputDescription and InputErrors.
     render() {
       const { didCheckErrors, errors, foo } = this.state;
       const inputDescription = {
-        message: {
-          id: 'my-plugin.inputFoo.description',
-          params: { bar: 'Something' }
-        }
+        id: 'my-plugin.inputFoo.description',
+        params: { bar: 'Something' },
       };
 
       // This can also works (it's the same behavior for the label)
@@ -555,10 +553,10 @@ Component integrates Label, InputText, InputDescription and InputErrors.
                 inputDescription={inputDescription}
                 name="foo"
                 onChange={this.handleChange}
-                label={{ message: {
+                label={{
                   id: 'my-plugin.inputFoo.label',
                   params: { name: <a href="strapi.io" target="_blank">Click me</a> }
-                }}}
+                }}
                 value={foo}
                 validations={{ required: true }}
               />
diff --git a/packages/strapi-helper-plugin/lib/src/components/InputNumberWithErrors/index.js b/packages/strapi-helper-plugin/lib/src/components/InputNumberWithErrors/index.js
index af9e626a04..1d142517f6 100644
--- a/packages/strapi-helper-plugin/lib/src/components/InputNumberWithErrors/index.js
+++ b/packages/strapi-helper-plugin/lib/src/components/InputNumberWithErrors/index.js
@@ -83,7 +83,7 @@ class InputNumberWithErrors extends React.Component { // eslint-disable-line rea
         <Label
           className={labelClassName}
           htmlFor={name}
-          message={this.props.label && this.props.label.message || this.props.label}
+          message={this.props.label}
           style={labelStyle}
         />
         <InputNumber
@@ -103,7 +103,7 @@ class InputNumberWithErrors extends React.Component { // eslint-disable-line rea
         />
         <InputDescription
           className={inputDescriptionClassName}
-          message={this.props.inputDescription && this.props.inputDescription.message || this.props.inputDescription}
+          message={this.props.inputDescription}
           style={inputDescriptionStyle}
         />
         <InputErrors
@@ -200,10 +200,8 @@ InputNumberWithErrors.propTypes = {
     PropTypes.string,
     PropTypes.func,
     PropTypes.shape({
-      message: PropTypes.shape({
-        id: PropTypes.string,
-        params: PropTypes.object,
-      }),
+      id: PropTypes.string,
+      params: PropTypes.object,
     }),
   ]),
   inputDescriptionClassName: PropTypes.string,
@@ -213,10 +211,8 @@ InputNumberWithErrors.propTypes = {
     PropTypes.string,
     PropTypes.func,
     PropTypes.shape({
-      message: PropTypes.shape({
-        id: PropTypes.string,
-        params: PropTypes.object,
-      }),
+      id: PropTypes.string,
+      params: PropTypes.object,
     }),
   ]),
   labelClassName: PropTypes.string,
diff --git a/packages/strapi-helper-plugin/lib/src/components/InputTextWithErrors/index.js b/packages/strapi-helper-plugin/lib/src/components/InputTextWithErrors/index.js
index a6a1c875e4..e9a5a7bb10 100644
--- a/packages/strapi-helper-plugin/lib/src/components/InputTextWithErrors/index.js
+++ b/packages/strapi-helper-plugin/lib/src/components/InputTextWithErrors/index.js
@@ -83,7 +83,7 @@ class InputTextWithErrors extends React.Component { // eslint-disable-line react
         <Label
           className={labelClassName}
           htmlFor={name}
-          message={this.props.label && this.props.label.message || this.props.label}
+          message={this.props.label}
           style={labelStyle}
         />
         <InputText
@@ -103,7 +103,7 @@ class InputTextWithErrors extends React.Component { // eslint-disable-line react
         />
         <InputDescription
           className={inputDescriptionClassName}
-          message={this.props.inputDescription && this.props.inputDescription.message || this.props.inputDescription}
+          message={this.props.inputDescription}
           style={inputDescriptionStyle}
         />
         <InputErrors
@@ -199,10 +199,8 @@ InputTextWithErrors.propTypes = {
     PropTypes.string,
     PropTypes.func,
     PropTypes.shape({
-      message: PropTypes.shape({
-        id: PropTypes.string,
-        params: PropTypes.object,
-      }),
+      id: PropTypes.string,
+      params: PropTypes.object,
     }),
   ]),
   inputDescriptionClassName: PropTypes.string,
@@ -212,10 +210,8 @@ InputTextWithErrors.propTypes = {
     PropTypes.string,
     PropTypes.func,
     PropTypes.shape({
-      message: PropTypes.shape({
-        id: PropTypes.string,
-        params: PropTypes.object,
-      }),
+      id: PropTypes.string,
+      params: PropTypes.object,
     }),
   ]),
   labelClassName: PropTypes.string,
diff --git a/packages/strapi-helper-plugin/lib/src/components/InputToggleWithErrors/index.js b/packages/strapi-helper-plugin/lib/src/components/InputToggleWithErrors/index.js
index 83f99955ac..3f5d437ba8 100644
--- a/packages/strapi-helper-plugin/lib/src/components/InputToggleWithErrors/index.js
+++ b/packages/strapi-helper-plugin/lib/src/components/InputToggleWithErrors/index.js
@@ -72,7 +72,7 @@ class InputToggleWithErrors extends React.Component {
           <Label
             className={cn(!isEmpty(labelClassName) && labelClassName)}
             htmlFor={name}
-            message={label && label.message || label}
+            message={label}
             style={labelStyle}
             />
         </div>
@@ -90,7 +90,7 @@ class InputToggleWithErrors extends React.Component {
         />
         <InputDescription
           className={inputDescriptionClassName}
-          message={inputDescription && inputDescription.message || inputDescription}
+          message={inputDescription}
           style={inputDescriptionStyle}
         />
         <InputErrors
@@ -141,10 +141,8 @@ InputToggleWithErrors.propTypes = {
     PropTypes.string,
     PropTypes.func,
     PropTypes.shape({
-      message: PropTypes.shape({
-        id: PropTypes.string,
-        params: PropTypes.object,
-      }),
+      id: PropTypes.string,
+      params: PropTypes.object,
     }),
   ]),
   inputDescriptionClassName: PropTypes.string,