diff --git a/packages/ant-component-mapper/src/date-picker/date-picker.js b/packages/ant-component-mapper/src/date-picker/date-picker.js
index 26bf6e7bc..fac269f0f 100644
--- a/packages/ant-component-mapper/src/date-picker/date-picker.js
+++ b/packages/ant-component-mapper/src/date-picker/date-picker.js
@@ -5,8 +5,8 @@ import { validationError } from '../validation-error/validation-error';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import FormGroup from '../form-group';
 
-const DatePicker = (props) => {
-  const { input, isReadOnly, isDisabled, placeholder, isRequired, label, helperText, description, validateOnMount, meta, FormItemProps, ...rest } =
+const DatePicker = ({ placeholder = 'Select date', ...props }) => {
+  const { input, isReadOnly, isDisabled, isRequired, label, helperText, description, validateOnMount, meta, FormItemProps, ...rest } =
     useFieldApi(props);
   const invalid = validationError(meta, validateOnMount);
 
@@ -50,8 +50,4 @@ DatePicker.propTypes = {
   FormItemProps: PropTypes.object,
 };
 
-DatePicker.defaultProps = {
-  placeholder: 'Select date',
-};
-
 export default DatePicker;
diff --git a/packages/ant-component-mapper/src/field-array/field-array.js b/packages/ant-component-mapper/src/field-array/field-array.js
index 884e1b486..6d4ada922 100644
--- a/packages/ant-component-mapper/src/field-array/field-array.js
+++ b/packages/ant-component-mapper/src/field-array/field-array.js
@@ -103,9 +103,9 @@ const DynamicArray = ({ ...props }) => {
     fields: formFields,
     defaultItem,
     meta,
-    minItems,
-    maxItems,
-    noItemsMessage,
+    minItems = 0,
+    maxItems = Infinity,
+    noItemsMessage = 'No items added',
     FormFieldGridProps,
     FormControlProps,
     buttonLabels,
@@ -113,22 +113,22 @@ const DynamicArray = ({ ...props }) => {
     isRequired,
     helperText,
     // customization props
-    FormItemProps,
-    ArrayItemProps,
-    FieldsContainerProps,
-    RemoveContainerProps,
-    RemoveButtonProps,
-    FieldArrayRowProps,
-    FieldArrayRowCol,
-    FieldArrayHeaderProps,
-    FieldArrayLabelProps,
-    FieldArrayButtonsProps,
-    UndoButtonProps,
-    RedoButtonProps,
-    AddButtonProps,
-    FieldArrayDescriptionProps,
-    NoItemsMessageProps,
-    ErrorMessageProps,
+    FormItemProps = {},
+    ArrayItemProps = {},
+    FieldsContainerProps = {},
+    RemoveContainerProps = {},
+    RemoveButtonProps = {},
+    FieldArrayRowProps = {},
+    FieldArrayRowCol = {},
+    FieldArrayHeaderProps = {},
+    FieldArrayLabelProps = {},
+    FieldArrayButtonsProps = {},
+    UndoButtonProps = {},
+    RedoButtonProps = {},
+    AddButtonProps = {},
+    FieldArrayDescriptionProps = {},
+    NoItemsMessageProps = {},
+    ErrorMessageProps = {},
     ...rest
   } = useFieldApi(props);
   const [state, dispatch] = useReducer(reducer, initialState);
@@ -275,26 +275,4 @@ DynamicArray.propTypes = {
   ErrorMessageProps: PropTypes.object,
 };
 
-DynamicArray.defaultProps = {
-  maxItems: Infinity,
-  minItems: 0,
-  noItemsMessage: 'No items added',
-  FormItemProps: {},
-  ArrayItemProps: {},
-  FieldsContainerProps: {},
-  RemoveContainerProps: {},
-  RemoveButtonProps: {},
-  FieldArrayRowProps: {},
-  FieldArrayRowCol: {},
-  FieldArrayHeaderProps: {},
-  FieldArrayLabelProps: {},
-  FieldArrayButtonsProps: {},
-  UndoButtonProps: {},
-  RedoButtonProps: {},
-  AddButtonProps: {},
-  FieldArrayDescriptionProps: {},
-  NoItemsMessageProps: {},
-  ErrorMessageProps: {},
-};
-
 export default DynamicArray;
diff --git a/packages/ant-component-mapper/src/form-template/form-template.js b/packages/ant-component-mapper/src/form-template/form-template.js
index 4dca4b3ae..47e502895 100644
--- a/packages/ant-component-mapper/src/form-template/form-template.js
+++ b/packages/ant-component-mapper/src/form-template/form-template.js
@@ -6,8 +6,8 @@ import { childrenPropTypes } from '@data-driven-forms/common/prop-types-template
 
 const { Title, Paragraph } = Typography;
 
-const Form = ({ children, onSubmit, ...props }) => (
-  <AntForm onFinish={onSubmit} {...props}>
+const Form = ({ children, onSubmit, layout = 'vertical', ...props }) => (
+  <AntForm onFinish={onSubmit} layout={layout} {...props}>
     {children}
   </AntForm>
 );
@@ -18,10 +18,6 @@ Form.propTypes = {
   children: childrenPropTypes,
 };
 
-Form.defaultProps = {
-  layout: 'vertical',
-};
-
 const Description = ({ children, ...props }) => (
   <Typography {...props}>
     <Paragraph>{children}</Paragraph>
diff --git a/packages/ant-component-mapper/src/radio/radio.js b/packages/ant-component-mapper/src/radio/radio.js
index e60c1b4f4..6670b143d 100644
--- a/packages/ant-component-mapper/src/radio/radio.js
+++ b/packages/ant-component-mapper/src/radio/radio.js
@@ -17,11 +17,23 @@ RadioOption.propTypes = {
 };
 
 const Radio = ({ name, component, ...props }) => {
-  const { options, isDisabled, label, isRequired, helperText, description, isReadOnly, meta, validateOnMount, FormItemProps, input, ...rest } =
-    useFieldApi({
-      ...props,
-      name,
-    });
+  const {
+    options = [],
+    isDisabled,
+    label,
+    isRequired,
+    helperText,
+    description,
+    isReadOnly,
+    meta,
+    validateOnMount,
+    FormItemProps,
+    input,
+    ...rest
+  } = useFieldApi({
+    ...props,
+    name,
+  });
 
   return (
     <FormGroup
@@ -58,8 +70,4 @@ Radio.propTypes = {
   component: PropTypes.string,
 };
 
-Radio.defaultProps = {
-  options: [],
-};
-
 export default Radio;
diff --git a/packages/ant-component-mapper/src/time-picker/time-picker.js b/packages/ant-component-mapper/src/time-picker/time-picker.js
index 3bda068d3..67e58d700 100644
--- a/packages/ant-component-mapper/src/time-picker/time-picker.js
+++ b/packages/ant-component-mapper/src/time-picker/time-picker.js
@@ -6,8 +6,20 @@ import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import FormGroup from '../form-group';
 
 const TimePicker = (props) => {
-  const { input, isReadOnly, isDisabled, placeholder, isRequired, label, helperText, description, validateOnMount, meta, FormItemProps, ...rest } =
-    useFieldApi(props);
+  const {
+    input,
+    isReadOnly,
+    isDisabled,
+    placeholder = 'Select date',
+    isRequired,
+    label,
+    helperText,
+    description,
+    validateOnMount,
+    meta,
+    FormItemProps,
+    ...rest
+  } = useFieldApi(props);
   const invalid = validationError(meta, validateOnMount);
 
   return (
@@ -52,8 +64,4 @@ TimePicker.propTypes = {
   FormItemProps: PropTypes.object,
 };
 
-TimePicker.defaultProps = {
-  placeholder: 'Select date',
-};
-
 export default TimePicker;
diff --git a/packages/ant-component-mapper/src/wizard/wizard-step.js b/packages/ant-component-mapper/src/wizard/wizard-step.js
index 605c0a86e..a9b6d5ab6 100644
--- a/packages/ant-component-mapper/src/wizard/wizard-step.js
+++ b/packages/ant-component-mapper/src/wizard/wizard-step.js
@@ -5,7 +5,7 @@ import WizardStepButtons from './step-buttons';
 
 import './wizard-step.css';
 
-const WizardStep = ({ fields, formOptions, WizardStepProps, ...rest }) => (
+const WizardStep = ({ fields = [], formOptions, WizardStepProps, ...rest }) => (
   <Fragment>
     <div className="ddorg__ant-component-mapper_wizard-step" {...WizardStepProps}>
       {fields.map((item) => formOptions.renderForm([item], formOptions))}
@@ -22,8 +22,4 @@ WizardStep.propTypes = {
   WizardStepProps: PropTypes.object,
 };
 
-WizardStep.defaultProps = {
-  fields: [],
-};
-
 export default WizardStep;
diff --git a/packages/blueprint-component-mapper/src/date-picker/date-picker.js b/packages/blueprint-component-mapper/src/date-picker/date-picker.js
index 05277777a..24a1cff2f 100644
--- a/packages/blueprint-component-mapper/src/date-picker/date-picker.js
+++ b/packages/blueprint-component-mapper/src/date-picker/date-picker.js
@@ -7,18 +7,21 @@ import { DatePicker as BDatePicker } from '@blueprintjs/datetime';
 import FormGroupWrapper from '../form-group/form-group';
 import propsCatcher from '../props-catcher/props-catcher';
 
-const DatePicker = ({ input, disabled, placeholder, valueRenderer, PopoverProps, ButtonProps, ...props }) => (
+const DatePicker = ({
+  input,
+  disabled,
+  placeholder = 'Select date...',
+  valueRenderer = (value) => value.toString(),
+  PopoverProps,
+  ButtonProps,
+  ...props
+}) => (
   <Popover disabled={disabled} {...PopoverProps}>
     <Button text={input.value ? valueRenderer(input.value) : placeholder} disabled={disabled} {...ButtonProps} />
     <BDatePicker id={input.name} {...propsCatcher(props)} {...input} value={input.value || null} />
   </Popover>
 );
 
-DatePicker.defaultProps = {
-  placeholder: 'Select date...',
-  valueRenderer: (value) => value.toString(),
-};
-
 DatePicker.propTypes = {
   input: PropTypes.object,
   disabled: PropTypes.bool,
diff --git a/packages/blueprint-component-mapper/src/dual-list-select/dual-list-select.js b/packages/blueprint-component-mapper/src/dual-list-select/dual-list-select.js
index c634fc9e2..d9036552d 100644
--- a/packages/blueprint-component-mapper/src/dual-list-select/dual-list-select.js
+++ b/packages/blueprint-component-mapper/src/dual-list-select/dual-list-select.js
@@ -28,7 +28,7 @@ const useStyles = createUseStyles({
   },
 });
 
-const List = ({ value, optionClick, noOptionsTitle, filterValue, filterValueText, selectedValues, MenuProps, MenuItemProps }) => {
+const List = ({ value = [], optionClick, noOptionsTitle, filterValue, filterValueText, selectedValues, MenuProps = {}, MenuItemProps = {} }) => {
   const { menu } = useStyles();
 
   return (
@@ -66,13 +66,17 @@ List.propTypes = {
   MenuItemProps: PropTypes.object,
 };
 
-List.defaultProps = {
-  value: [],
-  MenuProps: {},
-  MenuItemProps: {},
-};
-
-const Toolbar = ({ sortTitle, onFilter, onSort, sortDirection, value, placeholder, ControlGroupProps, InputGroupProps, ButtonProps }) => (
+const Toolbar = ({
+  sortTitle,
+  onFilter,
+  onSort,
+  sortDirection,
+  value,
+  placeholder,
+  ControlGroupProps = {},
+  InputGroupProps = {},
+  ButtonProps = {},
+}) => (
   <ControlGroup {...ControlGroupProps}>
     <InputGroup placeholder={placeholder} onChange={(e) => onFilter(e.target.value)} value={value} {...InputGroupProps} />
     <Button icon={sortDirection ? 'sort-desc' : 'sort-asc'} title={sortTitle} onClick={onSort} {...ButtonProps} />
@@ -91,27 +95,21 @@ Toolbar.propTypes = {
   ButtonProps: PropTypes.object,
 };
 
-Toolbar.defaultProps = {
-  ControlGroupProps: {},
-  InputGroupProps: {},
-  ButtonProps: {},
-};
-
 const DualListInternal = ({
-  allToRight,
-  allToLeft,
-  leftTitle,
-  moveAllLeftTitle,
-  moveAllRightTitle,
-  moveRightTitle,
-  moveLeftTitle,
-  rightTitle,
-  noValueTitle,
-  noOptionsTitle,
-  filterOptionsTitle,
-  filterValueTitle,
-  filterValueText,
-  filterOptionsText,
+  allToRight = true,
+  allToLeft = true,
+  leftTitle = 'Options',
+  moveAllLeftTitle = 'Move all to left',
+  moveAllRightTitle = 'Move all to right',
+  moveRightTitle = 'Move selected to right',
+  moveLeftTitle = 'Move selected to left',
+  rightTitle = 'Selected',
+  noValueTitle = 'No selected',
+  noOptionsTitle = 'No available options',
+  filterOptionsTitle = 'Filter options',
+  filterValueTitle = 'Filter selected value',
+  filterValueText = 'Remove your filter to see all selected',
+  filterOptionsText = 'Remove your filter to see all options',
   state,
   sortOptions,
   filterOptions,
@@ -125,26 +123,26 @@ const DualListInternal = ({
   filterValues,
   rightValues,
   handleValuesClick,
-  WrapperProps,
-  LeftWrapperProps,
-  RightWrapperProps,
-  ButtonGroupProps,
-  ToRightButtonProps,
-  AllToRightButtonProps,
-  AllToLeftButtonProps,
-  ToLeftButtonProps,
-  LeftControlGroupProps,
-  LeftInputGroupProps,
-  LeftButtonProps,
-  RightControlGroupProps,
-  RightInputGroupProps,
-  RightButtonProps,
-  LeftMenuProps,
-  LeftMenuItemProps,
-  RightMenuProps,
-  RightMenuItemProps,
-  leftSortTitle,
-  rightSortTitle,
+  WrapperProps = {},
+  LeftWrapperProps = {},
+  RightWrapperProps = {},
+  ButtonGroupProps = {},
+  ToRightButtonProps = {},
+  AllToRightButtonProps = {},
+  AllToLeftButtonProps = {},
+  ToLeftButtonProps = {},
+  LeftControlGroupProps = {},
+  LeftInputGroupProps = {},
+  LeftButtonProps = {},
+  RightControlGroupProps = {},
+  RightInputGroupProps = {},
+  RightButtonProps = {},
+  LeftMenuProps = {},
+  LeftMenuItemProps = {},
+  RightMenuProps = {},
+  RightMenuItemProps = {},
+  leftSortTitle = 'Sort options',
+  rightSortTitle = 'Sort value',
 }) => {
   const { buttonGroup, wrapper } = useStyles();
 
@@ -287,44 +285,6 @@ DualListInternal.propTypes = {
   rightSortTitle: PropTypes.string,
 };
 
-DualListInternal.defaultProps = {
-  leftTitle: 'Options',
-  rightTitle: 'Selected',
-  moveLeftTitle: 'Move selected to left',
-  moveRightTitle: 'Move selected to right',
-  moveAllRightTitle: 'Move all to right',
-  moveAllLeftTitle: 'Move all to left',
-  noOptionsTitle: 'No available options',
-  noValueTitle: 'No selected',
-  filterOptionsTitle: 'Filter options',
-  filterValueTitle: 'Filter selected value',
-  filterOptionsText: 'Remove your filter to see all options',
-  filterValueText: 'Remove your filter to see all selected',
-  leftSortTitle: 'Sort options',
-  rightSortTitle: 'Sort value',
-  options: [],
-  allToLeft: true,
-  allToRight: true,
-  WrapperProps: {},
-  LeftWrapperProps: {},
-  RightWrapperProps: {},
-  ButtonGroupProps: {},
-  ToRightButtonProps: {},
-  AllToRightButtonProps: {},
-  AllToLeftButtonProps: {},
-  ToLeftButtonProps: {},
-  LeftControlGroupProps: {},
-  LeftInputGroupProps: {},
-  LeftButtonProps: {},
-  RightControlGroupProps: {},
-  RightInputGroupProps: {},
-  RightButtonProps: {},
-  LeftMenuProps: {},
-  LeftMenuItemProps: {},
-  RightMenuProps: {},
-  RightMenuItemProps: {},
-};
-
 const DualListWrapper = (props) => <FormGroupInternal {...props} Component={DualListInternal} />;
 const DualListSelect = (props) => <DualListSelectCommon {...props} DualListSelect={DualListWrapper} />;
 
diff --git a/packages/blueprint-component-mapper/src/field-array/field-array.js b/packages/blueprint-component-mapper/src/field-array/field-array.js
index 81559fd87..b34208e0f 100644
--- a/packages/blueprint-component-mapper/src/field-array/field-array.js
+++ b/packages/blueprint-component-mapper/src/field-array/field-array.js
@@ -71,7 +71,7 @@ const FieldArray = (props) => {
     RemoveButtonProps,
     ArrayItemProps,
     FieldArrayProps,
-    noItemsMessage,
+    noItemsMessage = 'No items',
     validateOnMount,
     meta,
     helperText,
@@ -155,8 +155,4 @@ FieldArray.propTypes = {
   minItems: PropTypes.number,
 };
 
-FieldArray.defaultProps = {
-  noItemsMessage: 'No items',
-};
-
 export default FieldArray;
diff --git a/packages/blueprint-component-mapper/src/select/select.js b/packages/blueprint-component-mapper/src/select/select.js
index d1f335561..fd21ecb72 100644
--- a/packages/blueprint-component-mapper/src/select/select.js
+++ b/packages/blueprint-component-mapper/src/select/select.js
@@ -40,7 +40,15 @@ export const itemPredicate = (query, item) => {
   }
 };
 
-const Select = ({ input, options, placeholder, isSearchable, noOptionsMessage, isMulti, ...props }) => {
+const Select = ({
+  input,
+  options,
+  placeholder = 'Please select',
+  isSearchable = false,
+  noOptionsMessage = 'No options found',
+  isMulti,
+  ...props
+}) => {
   const Component = isMulti ? MultiSelect : BSelect;
 
   const selectedOption = options.find(({ value }) => value === input.value);
@@ -81,12 +89,6 @@ Select.propTypes = {
   disabled: PropTypes.bool,
 };
 
-Select.defaultProps = {
-  noOptionsMessage: 'No options found',
-  placeholder: 'Please select',
-  isSearchable: false,
-};
-
 const WrapperSelect = (props) => <FormGroupWrapper {...props} Component={Select} />;
 
 export default WrapperSelect;
diff --git a/packages/carbon-component-mapper/src/date-picker/date-picker.js b/packages/carbon-component-mapper/src/date-picker/date-picker.js
index e3acdf7cf..73a5adbb6 100644
--- a/packages/carbon-component-mapper/src/date-picker/date-picker.js
+++ b/packages/carbon-component-mapper/src/date-picker/date-picker.js
@@ -8,7 +8,16 @@ import prepareProps from '../prepare-props';
 import HelperTextBlock from '../helper-text-block/helper-text-block';
 
 const DatePicker = (props) => {
-  const { input, datePickerType, meta, DatePickerProps, validateOnMount, helperText, WrapperProps, ...rest } = useFieldApi(prepareProps(props));
+  const {
+    input,
+    datePickerType = 'single',
+    meta,
+    DatePickerProps,
+    validateOnMount,
+    helperText,
+    WrapperProps,
+    ...rest
+  } = useFieldApi(prepareProps(props));
 
   const invalid = (meta.touched || validateOnMount) && (meta.error || meta.submitError);
   const warnText = (meta.touched || validateOnMount) && meta.warning;
@@ -31,8 +40,4 @@ DatePicker.propTypes = {
   WrapperProps: PropTypes.object,
 };
 
-DatePicker.defaultProps = {
-  datePickerType: 'single',
-};
-
 export default DatePicker;
diff --git a/packages/carbon-component-mapper/src/dual-list-select/dual-list-select.js b/packages/carbon-component-mapper/src/dual-list-select/dual-list-select.js
index 5065ffaae..ae1ac410c 100644
--- a/packages/carbon-component-mapper/src/dual-list-select/dual-list-select.js
+++ b/packages/carbon-component-mapper/src/dual-list-select/dual-list-select.js
@@ -149,46 +149,46 @@ const DualListSelectInner = ({
   filterValues,
   sortOptions,
   sortValues,
-  noOptionsTitle,
-  noValueTitle,
-  leftTitle,
-  rightTitle,
-  LeftTitleElement,
-  RightTitleElement,
   LeftTitleProps,
   RightTitleProps,
-  moveLeftTitle,
-  moveRightTitle,
-  moveAllLeftTitle,
-  moveAllRightTitle,
   label,
   isRequired,
-  filterOptionsTitle,
-  filterValuesTitle,
-  sortOptionsTitle,
-  sortValuesTitle,
-  filterOptionsText,
-  filterValueText,
-  FormGroupProps,
-  GridProps,
-  RowProps,
-  OptionsColumnProps,
-  ButtonColumnProps,
-  ValuesColumnProps,
-  AddButtonProps,
-  AddAllButtonProps,
-  RemoveButtonProps,
-  RemoveAllButtonProps,
-  LeftToolbarProps,
-  RightToolbarProps,
-  LeftSearchProps,
-  RightSearchProps,
-  LeftSortProps,
-  RightSortProps,
-  LeftListProps,
-  LeftBodyProps,
-  RightListProps,
-  RightBodyProps,
+  noOptionsTitle = 'No option available',
+  noValueTitle = 'No option selected',
+  leftTitle = 'Options',
+  rightTitle = 'Selected',
+  LeftTitleElement = 'h6',
+  RightTitleElement = 'h6',
+  moveLeftTitle = 'Remove',
+  moveRightTitle = 'Add',
+  moveAllLeftTitle = 'Remove All',
+  moveAllRightTitle = 'Add All',
+  filterOptionsTitle = 'Filter options',
+  filterValuesTitle = 'Filter values',
+  sortOptionsTitle = 'Sort options',
+  sortValuesTitle = 'Sort values',
+  filterOptionsText = 'Remove your filter to see all options',
+  filterValueText = 'Remove your filter to see all selected',
+  FormGroupProps = {},
+  GridProps = {},
+  RowProps = {},
+  OptionsColumnProps = {},
+  ButtonColumnProps = {},
+  ValuesColumnProps = {},
+  AddButtonProps = {},
+  AddAllButtonProps = {},
+  RemoveButtonProps = {},
+  RemoveAllButtonProps = {},
+  LeftToolbarProps = {},
+  RightToolbarProps = {},
+  LeftSearchProps = {},
+  RightSearchProps = {},
+  LeftSortProps = {},
+  RightSortProps = {},
+  LeftListProps = {},
+  LeftBodyProps = {},
+  RightListProps = {},
+  RightBodyProps = {},
 }) => {
   const { buttonWrapper } = useStyles();
 
@@ -326,45 +326,6 @@ DualListSelectInner.propTypes = {
   RightBodyProps: PropTypes.object,
 };
 
-DualListSelectInner.defaultProps = {
-  noOptionsTitle: 'No option available',
-  noValueTitle: 'No option selected',
-  leftTitle: 'Options',
-  rightTitle: 'Selected',
-  LeftTitleElement: 'h6',
-  RightTitleElement: 'h6',
-  moveLeftTitle: 'Remove',
-  moveRightTitle: 'Add',
-  moveAllLeftTitle: 'Remove All',
-  moveAllRightTitle: 'Add All',
-  filterOptionsTitle: 'Filter options',
-  filterValuesTitle: 'Filter values',
-  sortOptionsTitle: 'Sort options',
-  sortValuesTitle: 'Sort values',
-  filterOptionsText: 'Remove your filter to see all options',
-  filterValueText: 'Remove your filter to see all selected',
-  FormGroupProps: {},
-  GridProps: {},
-  RowProps: {},
-  OptionsColumnProps: {},
-  ButtonColumnProps: {},
-  ValuesColumnProps: {},
-  AddButtonProps: {},
-  AddAllButtonProps: {},
-  RemoveButtonProps: {},
-  RemoveAllButtonProps: {},
-  LeftToolbarProps: {},
-  RightToolbarProps: {},
-  LeftSearchProps: {},
-  RightSearchProps: {},
-  LeftSortProps: {},
-  RightSortProps: {},
-  LeftListProps: {},
-  LeftBodyProps: {},
-  RightListProps: {},
-  RightBodyProps: {},
-};
-
 const DualListSelect = (props) => <DualListSelectCommon {...props} DualListSelect={DualListSelectInner} />;
 
 export default DualListSelect;
diff --git a/packages/carbon-component-mapper/src/field-array/field-array.js b/packages/carbon-component-mapper/src/field-array/field-array.js
index 3e8ddf68f..68c8d6bf7 100644
--- a/packages/carbon-component-mapper/src/field-array/field-array.js
+++ b/packages/carbon-component-mapper/src/field-array/field-array.js
@@ -32,7 +32,7 @@ const useStyles = createUseStyles({
 });
 
 const ArrayItem = memo(
-  ({ remove, fields, name, removeText, buttonDisabled, RemoveButtonProps, ArrayItemProps }) => {
+  ({ remove, fields, name, removeText, buttonDisabled, RemoveButtonProps = {}, ArrayItemProps = {} }) => {
     const formOptions = useFormApi();
     const { remove: removeStyle } = useStyles();
 
@@ -71,28 +71,23 @@ ArrayItem.propTypes = {
   ArrayItemProps: PropTypes.object,
 };
 
-ArrayItem.defaultProps = {
-  RemoveButtonProps: {},
-  ArrayItemProps: {},
-};
-
 const FieldArray = (props) => {
   const {
-    AddContainerProps,
-    AddButtonProps,
-    FormGroupProps,
-    WrapperProps,
-    ArrayItemProps,
-    RemoveButtonProps,
+    AddContainerProps = {},
+    AddButtonProps = {},
+    FormGroupProps = {},
+    WrapperProps = {},
+    ArrayItemProps = {},
+    RemoveButtonProps = {},
     defaultItem,
-    maxItems,
-    minItems,
+    maxItems = Infinity,
+    minItems = 0,
     fields,
     input,
     arrayValidator,
     labelText,
     buttonLabels,
-    noItemsMessage,
+    noItemsMessage = 'No items',
     meta,
     validateOnMount,
   } = useFieldApi(prepareProps(props));
@@ -170,16 +165,4 @@ FieldArray.propTypes = {
   fields: PropTypes.array,
 };
 
-FieldArray.defaultProps = {
-  noItemsMessage: 'No items',
-  maxItems: Infinity,
-  minItems: 0,
-  AddContainerProps: {},
-  AddButtonProps: {},
-  FormGroupProps: {},
-  WrapperProps: {},
-  ArrayItemProps: {},
-  RemoveButtonProps: {},
-};
-
 export default FieldArray;
diff --git a/packages/carbon-component-mapper/src/plain-text/plain-text.js b/packages/carbon-component-mapper/src/plain-text/plain-text.js
index c9472c937..e3284bbbf 100644
--- a/packages/carbon-component-mapper/src/plain-text/plain-text.js
+++ b/packages/carbon-component-mapper/src/plain-text/plain-text.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-const PlainText = ({ label, element, component, ...rest }) =>
+const PlainText = ({ label, element = 'p', component, ...rest }) =>
   label.split('\n').map((paragraph, index) => React.createElement(element, { key: index, ...rest }, paragraph));
 
 PlainText.propTypes = {
@@ -10,8 +10,4 @@ PlainText.propTypes = {
   component: PropTypes.string,
 };
 
-PlainText.defaultProps = {
-  element: 'p',
-};
-
 export default PlainText;
diff --git a/packages/carbon-component-mapper/src/select/select.js b/packages/carbon-component-mapper/src/select/select.js
index de0a372f8..91267c476 100644
--- a/packages/carbon-component-mapper/src/select/select.js
+++ b/packages/carbon-component-mapper/src/select/select.js
@@ -258,7 +258,18 @@ ClearedSelectSearchable.propTypes = {
 };
 
 const Select = (props) => {
-  const { isMulti, isSearchable, isClearable, loadOptions, input, meta, validateOnMount, helperText, ...rest } = useFieldApi(prepareProps(props));
+  const {
+    isMulti,
+    isSearchable,
+    isClearable,
+    loadOptions,
+    input,
+    meta,
+    validateOnMount,
+    helperText,
+    loadingMessage = 'Loading...',
+    ...rest
+  } = useFieldApi(prepareProps(props));
 
   const [loadOptionsChangeCounter, setCounter] = useState(0);
 
@@ -287,6 +298,7 @@ const Select = (props) => {
     <DataDrivenSelect
       SelectComponent={Component}
       simpleValue={false}
+      loadingMessage={loadingMessage}
       {...rest}
       {...input}
       isMulti={isMulti}
@@ -309,8 +321,4 @@ Select.propTypes = {
   ),
 };
 
-Select.defaultProps = {
-  loadingMessage: 'Loading...',
-};
-
 export default Select;
diff --git a/packages/carbon-component-mapper/src/sub-form/sub-form.js b/packages/carbon-component-mapper/src/sub-form/sub-form.js
index 53fcc87aa..3a3a0a4e5 100644
--- a/packages/carbon-component-mapper/src/sub-form/sub-form.js
+++ b/packages/carbon-component-mapper/src/sub-form/sub-form.js
@@ -13,7 +13,18 @@ const useStyles = createUseStyles({
   },
 });
 
-const SubForm = ({ fields, component, title, description, TitleElement, DescriptionElement, TitleProps, DescriptionProps, HeaderProps, ...rest }) => {
+const SubForm = ({
+  fields,
+  component,
+  title,
+  description,
+  TitleElement = 'h3',
+  DescriptionElement = 'p',
+  TitleProps,
+  DescriptionProps,
+  HeaderProps,
+  ...rest
+}) => {
   const formOptions = useFormApi();
   const { tab } = useStyles();
 
@@ -42,9 +53,4 @@ SubForm.propTypes = {
   HeaderProps: PropTypes.object,
 };
 
-SubForm.defaultProps = {
-  TitleElement: 'h3',
-  DescriptionElement: 'p',
-};
-
 export default SubForm;
diff --git a/packages/carbon-component-mapper/src/tabs/tabs.js b/packages/carbon-component-mapper/src/tabs/tabs.js
index 39377ae79..66493d0ba 100644
--- a/packages/carbon-component-mapper/src/tabs/tabs.js
+++ b/packages/carbon-component-mapper/src/tabs/tabs.js
@@ -15,7 +15,7 @@ const useStyles = createUseStyles({
   },
 });
 
-const Tabs = ({ fields, component, name, TabWrapperProps, ...props }) => {
+const Tabs = ({ fields, component, name, TabWrapperProps = {}, ...props }) => {
   const formOptions = useFormApi();
   const { tab } = useStyles();
 
@@ -46,8 +46,4 @@ Tabs.propTypes = {
   ),
 };
 
-Tabs.defaultProps = {
-  TabWrapperProps: {},
-};
-
 export default Tabs;
diff --git a/packages/carbon-component-mapper/src/wizard/wizard.js b/packages/carbon-component-mapper/src/wizard/wizard.js
index 357d65713..b65a4c556 100644
--- a/packages/carbon-component-mapper/src/wizard/wizard.js
+++ b/packages/carbon-component-mapper/src/wizard/wizard.js
@@ -103,13 +103,13 @@ VerticalLayout.propTypes = {
 const WizardInternal = ({
   stepsInfo,
   buttonLabels,
-  ButtonSetProps,
-  BackButtonProps,
-  NextButtonProps,
-  SubmitButtonProps,
-  ProgressIndicatorProps,
+  ButtonSetProps = {},
+  BackButtonProps = {},
+  NextButtonProps = {},
+  SubmitButtonProps = {},
+  ProgressIndicatorProps = {},
   vertical,
-  WizardBodyProps,
+  WizardBodyProps = {},
   conditionalSubmitFlag,
   ...props
 }) => {
@@ -187,15 +187,6 @@ WizardInternal.propTypes = {
   conditionalSubmitFlag: PropTypes.string.isRequired,
 };
 
-WizardInternal.defaultProps = {
-  BackButtonProps: {},
-  NextButtonProps: {},
-  SubmitButtonProps: {},
-  ButtonSetProps: {},
-  ProgressIndicatorProps: {},
-  WizardBodyProps: {},
-};
-
 const Wizard = (props) => <WizardCommon Wizard={WizardInternal} {...props} />;
 
 export default Wizard;
diff --git a/packages/common/src/form-template/form-template.js b/packages/common/src/form-template/form-template.js
index cfbf79716..39f7116bc 100644
--- a/packages/common/src/form-template/form-template.js
+++ b/packages/common/src/form-template/form-template.js
@@ -24,18 +24,18 @@ export const completeButtons = (buttonOrder) => {
 export const FormControls = ({
   onCancel,
   onReset,
-  submitLabel,
-  cancelLabel,
-  resetLabel,
-  canReset,
+  submitLabel = 'Submit',
+  cancelLabel = 'Cancel',
+  resetLabel = 'Reset',
+  canReset = false,
   disableSubmit,
-  buttonOrder,
+  buttonOrder = ['submit', 'reset', 'cancel'],
   buttonClassName,
   FormButtons,
   Button,
   ButtonGroup,
   formSpyProps,
-  buttonsProps,
+  buttonsProps = {},
   buttonGroupProps,
 }) => {
   if (FormButtons) {
@@ -96,16 +96,6 @@ FormControls.propTypes = {
   buttonsProps: PropTypes.object,
 };
 
-FormControls.defaultProps = {
-  submitLabel: 'Submit',
-  cancelLabel: 'Cancel',
-  resetLabel: 'Reset',
-  canReset: false,
-  canSubmit: false,
-  buttonOrder: ['submit', 'reset', 'cancel'],
-  buttonsProps: {},
-};
-
 const FormTemplate = ({
   FormWrapper,
   Title,
@@ -113,9 +103,9 @@ const FormTemplate = ({
   Button,
   ButtonGroup,
   formWrapperProps,
-  showFormControls,
-  disableSubmit,
-  Header,
+  showFormControls = true,
+  disableSubmit = [],
+  Header = React.Fragment,
   headerProps,
   titleProps,
   descriptionProps,
@@ -189,10 +179,4 @@ FormTemplate.propTypes = {
   alertProps: PropTypes.object,
 };
 
-FormTemplate.defaultProps = {
-  showFormControls: true,
-  disableSubmit: [],
-  Header: React.Fragment,
-};
-
 export default FormTemplate;
diff --git a/packages/common/src/select/select.js b/packages/common/src/select/select.js
index 0d1c0d273..ae4555364 100644
--- a/packages/common/src/select/select.js
+++ b/packages/common/src/select/select.js
@@ -7,14 +7,15 @@ import useSelect from '../use-select/use-select';
 import deepEqual from './deep-equal';
 
 const Select = ({
-  invalid,
+  invalid = false,
   classNamePrefix,
-  simpleValue,
+  simpleValue = true,
   isMulti,
-  pluckSingleValue,
-  options: propsOptions,
+  pluckSingleValue = true,
+  options: propsOptions = [],
   loadOptions,
   loadingMessage,
+  placeholder = 'Choose...',
   loadingProps,
   selectVariant,
   updatingMessage,
@@ -26,6 +27,8 @@ const Select = ({
   noValueUpdates,
   optionsTransformer,
   compareValues = deepEqual,
+  isSearchable = false,
+  isClearable = false,
   ...props
 }) => {
   const {
@@ -42,7 +45,7 @@ const Select = ({
     onChange,
     value,
     loadOptionsChangeCounter,
-    isSearchable: props.isSearchable,
+    isSearchable,
     pluckSingleValue,
     isMulti,
     simpleValue,
@@ -60,11 +63,14 @@ const Select = ({
   if (state.isLoading) {
     return (
       <SelectComponent
+        isClearable={isClearable}
+        isSearchable={isSearchable}
         {...props}
         classNamePrefix={classNamePrefix}
         isDisabled={true}
         isFetching={true}
-        placeholder={loadingMessage}
+        placeholder={placeholder}
+        loadingMessage={loadingMessage}
         options={state.options}
         onChange={() => {}}
         onInputChange={onInputChange}
@@ -83,6 +89,9 @@ const Select = ({
         'has-error': invalid,
       })}
       {...props}
+      isSearchable={isSearchable}
+      isClearable={isClearable}
+      placeholder={placeholder}
       isDisabled={props.isDisabled || props.isReadOnly}
       options={state.options}
       classNamePrefix={classNamePrefix}
@@ -119,21 +128,11 @@ Select.propTypes = {
   updatingMessage: PropTypes.node,
   noOptionsMessage: PropTypes.node,
   isSearchable: PropTypes.bool,
+  isClearable: PropTypes.bool,
   SelectComponent: PropTypes.elementType.isRequired,
   noValueUpdates: PropTypes.bool,
   optionsTransformer: PropTypes.func,
   compareValues: PropTypes.func,
 };
 
-Select.defaultProps = {
-  options: [],
-  invalid: false,
-  simpleValue: true,
-  pluckSingleValue: true,
-  placeholder: 'Choose...',
-  isSearchable: false,
-  isClearable: false,
-  compareValues: deepEqual,
-};
-
 export default Select;
diff --git a/packages/common/src/tests/select/select.test.js b/packages/common/src/tests/select/select.test.js
index bfadf4a33..9b54fd3af 100644
--- a/packages/common/src/tests/select/select.test.js
+++ b/packages/common/src/tests/select/select.test.js
@@ -470,8 +470,9 @@ describe('Select test', () => {
         isDisabled: true,
         isFetching: true,
         isSearchable: false,
+        loadingMessage: undefined,
         options: [],
-        placeholder: undefined,
+        placeholder: 'Choose...',
         isMulti: undefined,
         value: [],
       });
diff --git a/packages/common/src/wizard/wizard.js b/packages/common/src/wizard/wizard.js
index 102f68206..c3b06d425 100644
--- a/packages/common/src/wizard/wizard.js
+++ b/packages/common/src/wizard/wizard.js
@@ -10,7 +10,7 @@ import reducer, { DYNAMIC_WIZARD_TYPES, findCurrentStep } from './reducer';
 import selectNext from './select-next';
 import { CONDITIONAL_SUBMIT_FLAG } from './consts';
 
-const Wizard = ({ fields, isDynamic, crossroads, Wizard, component, initialState, ...props }) => {
+const Wizard = ({ fields, isDynamic, crossroads, Wizard, component, initialState, conditionalSubmitFlag = CONDITIONAL_SUBMIT_FLAG, ...props }) => {
   const formOptions = useFormApi();
 
   const [state, dispatch] = useReducer(reducer, {
@@ -92,7 +92,7 @@ const Wizard = ({ fields, isDynamic, crossroads, Wizard, component, initialState
         selectNext,
       }}
     >
-      <Wizard {...props} />
+      <Wizard conditionalSubmitFlag={conditionalSubmitFlag} {...props} />
     </WizardContext.Provider>
   );
 };
@@ -111,10 +111,6 @@ Wizard.propTypes = {
   conditionalSubmitFlag: PropTypes.string,
 };
 
-Wizard.defaultProps = {
-  conditionalSubmitFlag: CONDITIONAL_SUBMIT_FLAG,
-};
-
 export default Wizard;
 
 export const wizardProps = {
diff --git a/packages/mui-component-mapper/src/checkbox/checkbox.js b/packages/mui-component-mapper/src/checkbox/checkbox.js
index 2162358a6..4efc01bac 100644
--- a/packages/mui-component-mapper/src/checkbox/checkbox.js
+++ b/packages/mui-component-mapper/src/checkbox/checkbox.js
@@ -19,13 +19,13 @@ export const SingleCheckbox = (props) => {
     description,
     validateOnMount,
     meta,
-    FormFieldGridProps,
-    FormControlProps,
-    FormGroupProps,
-    FormControlLabelProps,
-    CheckboxProps,
-    FormLabelProps,
-    FormHelperTextProps,
+    FormFieldGridProps = {},
+    FormControlProps = {},
+    FormGroupProps = {},
+    FormControlLabelProps = {},
+    CheckboxProps = {},
+    FormLabelProps = {},
+    FormHelperTextProps = {},
     inputProps,
     ...rest
   } = useFieldApi({
@@ -82,16 +82,6 @@ SingleCheckbox.propTypes = {
   FormHelperTextProps: PropTypes.object,
 };
 
-SingleCheckbox.defaultProps = {
-  FormFieldGridProps: {},
-  FormControlProps: {},
-  FormGroupProps: {},
-  FormControlLabelProps: {},
-  CheckboxProps: {},
-  FormLabelProps: {},
-  FormHelperTextProps: {},
-};
-
 const Checkbox = ({ options, ...props }) => (options ? <MultipleChoiceList options={options} {...props} /> : <SingleCheckbox {...props} />);
 
 Checkbox.propTypes = {
diff --git a/packages/mui-component-mapper/src/date-picker/date-picker.js b/packages/mui-component-mapper/src/date-picker/date-picker.js
index 560a0a8d4..f5a201b64 100644
--- a/packages/mui-component-mapper/src/date-picker/date-picker.js
+++ b/packages/mui-component-mapper/src/date-picker/date-picker.js
@@ -21,8 +21,8 @@ const DatePicker = (props) => {
     description,
     validateOnMount,
     meta,
-    FormFieldGridProps,
-    DatePickerProps,
+    FormFieldGridProps = {},
+    DatePickerProps = {},
   } = useFieldApi(props);
   const invalid = validationError(meta, validateOnMount);
 
@@ -80,9 +80,4 @@ DatePicker.propTypes = {
   DatePickerProps: PropTypes.object,
 };
 
-DatePicker.defaultProps = {
-  FormFieldGridProps: {},
-  DatePickerProps: {},
-};
-
 export default DatePicker;
diff --git a/packages/mui-component-mapper/src/dual-list-select/dual-list-select.js b/packages/mui-component-mapper/src/dual-list-select/dual-list-select.js
index 8b009ed20..0f6ae2ae8 100644
--- a/packages/mui-component-mapper/src/dual-list-select/dual-list-select.js
+++ b/packages/mui-component-mapper/src/dual-list-select/dual-list-select.js
@@ -77,13 +77,13 @@ const StyledDualListSelect = styled(FormFieldGrid)(({ theme }) => ({
 }));
 
 const ListInternal = ({
-  value,
+  value = [],
   optionClick,
   noOptionsTitle,
   filterValue,
   filterValueText,
   selectedValues,
-  ListProps,
+  ListProps = {},
   ListItemProps,
   ListItemIconProps,
   ListItemTextProps,
@@ -164,11 +164,6 @@ ListInternal.propTypes = {
   LeftPaperProps: PropTypes.object,
 };
 
-ListInternal.defaultProps = {
-  value: [],
-  ListProps: {},
-};
-
 const ToolbarInternal = ({
   ToolbarProps,
   LeftToolbarProps,
@@ -241,23 +236,23 @@ ToolbarInternal.propTypes = {
 const DualListSelect = ({
   handleOptionsClick,
   rightValues,
-  noValueTitle,
-  filterValueText,
+  noValueTitle = 'No selected',
+  filterValueText = 'Remove your filter to see all selected',
   leftValues,
-  noOptionsTitle,
+  noOptionsTitle = 'No available options',
   state,
-  filterOptionsText,
+  filterOptionsText = 'Remove your filter to see all options',
   handleValuesClick,
   handleMoveRight,
-  moveRightTitle,
+  moveRightTitle = 'Move selected to right',
   handleClearLeftValues,
-  moveAllRightTitle,
+  moveAllRightTitle = 'Move all to right',
   handleClearRightValues,
-  moveAllLeftTitle,
+  moveAllLeftTitle = 'Move all to left',
   handleMoveLeft,
-  moveLeftTitle,
-  allToRight,
-  allToLeft,
+  moveLeftTitle = 'Move selected to left',
+  allToRight = true,
+  allToLeft = true,
   checkboxVariant,
   isRequired,
   meta,
@@ -265,15 +260,15 @@ const DualListSelect = ({
   label,
   helperText,
   description,
-  filterOptionsTitle,
-  leftTitle,
+  filterOptionsTitle = 'Filter options',
+  leftTitle = 'Options',
   filterOptions,
   sortOptions,
   sortValues,
-  filterValueTitle,
+  filterValueTitle = 'Filter selected value',
   filterValues,
-  rightTitle,
-  isFilterable,
+  rightTitle = 'Selected',
+  isFilterable = true,
   // Props
   FormFieldGridProps,
   InternalGridProps,
@@ -616,25 +611,6 @@ DualListSelect.propTypes = {
   RightPaperProps: PropTypes.object,
 };
 
-DualListSelect.defaultProps = {
-  leftTitle: 'Options',
-  rightTitle: 'Selected',
-  moveLeftTitle: 'Move selected to left',
-  moveRightTitle: 'Move selected to right',
-  moveAllRightTitle: 'Move all to right',
-  moveAllLeftTitle: 'Move all to left',
-  noOptionsTitle: 'No available options',
-  noValueTitle: 'No selected',
-  filterOptionsTitle: 'Filter options',
-  filterValueTitle: 'Filter selected value',
-  filterOptionsText: 'Remove your filter to see all options',
-  filterValueText: 'Remove your filter to see all selected',
-  options: [],
-  allToLeft: true,
-  allToRight: true,
-  isFilterable: true,
-};
-
 const DualListSelectWrapper = (props) => <DualListSelectCommon {...props} DualListSelect={DualListSelect} />;
 
 export default DualListSelectWrapper;
diff --git a/packages/mui-component-mapper/src/field-array/field-array.js b/packages/mui-component-mapper/src/field-array/field-array.js
index 67e179f40..bf5c9dcbd 100644
--- a/packages/mui-component-mapper/src/field-array/field-array.js
+++ b/packages/mui-component-mapper/src/field-array/field-array.js
@@ -57,10 +57,10 @@ const ArrayItem = memo(
     length,
     minItems,
     removeLabel,
-    FieldContainerProps,
-    FieldGroupGridProps,
-    RemoveButtonGridProps,
-    RemoveButtonProps,
+    FieldContainerProps = {},
+    FieldGroupGridProps = {},
+    RemoveButtonGridProps = {},
+    RemoveButtonProps = {},
   }) => {
     const { renderForm } = useFormApi();
 
@@ -101,13 +101,6 @@ ArrayItem.propTypes = {
   RemoveButtonProps: PropTypes.object,
 };
 
-ArrayItem.defaultProps = {
-  FieldContainerProps: {},
-  FieldGroupGridProps: {},
-  RemoveButtonGridProps: {},
-  RemoveButtonProps: {},
-};
-
 const defaultButtonLabels = {
   add: 'ADD',
   remove: 'REMOVE',
@@ -153,28 +146,28 @@ const DynamicArray = ({ ...props }) => {
     fields: formFields,
     defaultItem,
     meta,
-    minItems,
-    maxItems,
-    noItemsMessage,
-    FormFieldGridProps,
-    FormControlProps,
+    minItems = 0,
+    maxItems = Infinity,
+    noItemsMessage = 'No items added',
+    FormFieldGridProps = {},
+    FormControlProps = {},
     buttonLabels,
-    GridContainerProps,
-    HeaderGridProps,
-    HeaderProps,
-    UndoButtonProps,
-    RedoButtonProps,
-    AddButtonProps,
-    DescriptionGridProps,
-    DescriptionProps,
-    BodyGridProps,
-    NoItemsProps,
-    FormHelperTextGridProps,
-    FormHelperTextProps,
-    FieldContainerProps,
-    FieldGroupGridProps,
-    RemoveButtonGridProps,
-    RemoveButtonProps,
+    GridContainerProps = {},
+    HeaderGridProps = {},
+    HeaderProps = {},
+    UndoButtonProps = {},
+    RedoButtonProps = {},
+    AddButtonProps = {},
+    DescriptionGridProps = {},
+    DescriptionProps = {},
+    BodyGridProps = {},
+    NoItemsProps = {},
+    FormHelperTextGridProps = {},
+    FormHelperTextProps = {},
+    FieldContainerProps = {},
+    FieldGroupGridProps = {},
+    RemoveButtonGridProps = {},
+    RemoveButtonProps = {},
     ...rest
   } = useFieldApi(props);
   const [state, dispatch] = useReducer(reducer, initialState);
@@ -325,28 +318,4 @@ DynamicArray.propTypes = {
   RemoveButtonProps: PropTypes.object,
 };
 
-DynamicArray.defaultProps = {
-  maxItems: Infinity,
-  minItems: 0,
-  noItemsMessage: 'No items added',
-  FormControlProps: {},
-  FormFieldGridProps: {},
-  GridContainerProps: {},
-  HeaderGridProps: {},
-  HeaderProps: {},
-  UndoButtonProps: {},
-  RedoButtonProps: {},
-  AddButtonProps: {},
-  DescriptionGridProps: {},
-  DescriptionProps: {},
-  BodyGridProps: {},
-  NoItemsProps: {},
-  FormHelperTextGridProps: {},
-  FormHelperTextProps: {},
-  FieldContainerProps: {},
-  FieldGroupGridProps: {},
-  RemoveButtonGridProps: {},
-  RemoveButtonProps: {},
-};
-
 export default DynamicArray;
diff --git a/packages/mui-component-mapper/src/multiple-chioce-list/multiple-choice-list.js b/packages/mui-component-mapper/src/multiple-chioce-list/multiple-choice-list.js
index 122098931..035f30f9d 100644
--- a/packages/mui-component-mapper/src/multiple-chioce-list/multiple-choice-list.js
+++ b/packages/mui-component-mapper/src/multiple-chioce-list/multiple-choice-list.js
@@ -51,13 +51,13 @@ Wrapper.propTypes = {
 };
 
 const MultipleChoiceList = ({
-  FormControlProps,
-  FormLabelProps,
-  FormGroupProps,
-  FormHelperTextProps,
-  FormFieldGridProps,
-  FormControlLabelProps,
-  CheckboxProps,
+  FormControlProps = {},
+  FormLabelProps = {},
+  FormGroupProps = {},
+  FormHelperTextProps = {},
+  FormFieldGridProps = {},
+  FormControlLabelProps = {},
+  CheckboxProps = {},
   ...props
 }) => (
   <CheckboxContext.Provider
@@ -79,14 +79,5 @@ MultipleChoiceList.propTypes = {
   FormLabelProps: PropTypes.object,
   FormHelperTextProps: PropTypes.object,
 };
-MultipleChoiceList.defaultProps = {
-  FormFieldGridProps: {},
-  FormControlProps: {},
-  FormGroupProps: {},
-  FormControlLabelProps: {},
-  CheckboxProps: {},
-  FormLabelProps: {},
-  FormHelperTextProps: {},
-};
 
 export default MultipleChoiceList;
diff --git a/packages/mui-component-mapper/src/plain-text/plain-text.js b/packages/mui-component-mapper/src/plain-text/plain-text.js
index ad161573d..94b6a5631 100644
--- a/packages/mui-component-mapper/src/plain-text/plain-text.js
+++ b/packages/mui-component-mapper/src/plain-text/plain-text.js
@@ -2,10 +2,10 @@ import React from 'react';
 import { Typography } from '@mui/material';
 import PropTypes from 'prop-types';
 
-const PlainText = ({ label, name, component, element, ...props }) =>
+const PlainText = ({ label, name, component, element, variant = 'body1', gutterBottom = true, ...props }) =>
   typeof label === 'string' ? (
     label.split('\n').map((paragraph, index) => (
-      <Typography key={`${index}-${name}`} {...props} {...(element && { component: element })}>
+      <Typography key={`${index}-${name}`} variant={variant} gutterBottom={gutterBottom} {...props} {...(element && { component: element })}>
         {paragraph}
       </Typography>
     ))
@@ -20,11 +20,8 @@ PlainText.propTypes = {
   name: PropTypes.string.isRequired,
   component: PropTypes.any,
   element: PropTypes.elementType,
-};
-
-PlainText.defaultProps = {
-  variant: 'body1',
-  gutterBottom: true,
+  gutterBottom: PropTypes.bool,
+  variant: PropTypes.string,
 };
 
 export default PlainText;
diff --git a/packages/mui-component-mapper/src/radio/radio.js b/packages/mui-component-mapper/src/radio/radio.js
index 2094b04e3..10262b737 100644
--- a/packages/mui-component-mapper/src/radio/radio.js
+++ b/packages/mui-component-mapper/src/radio/radio.js
@@ -58,7 +58,7 @@ RadioOption.propTypes = {
 
 const Radio = ({ name, ...props }) => {
   const {
-    options,
+    options = [],
     isDisabled,
     label,
     isRequired,
@@ -67,10 +67,12 @@ const Radio = ({ name, ...props }) => {
     isReadOnly,
     meta,
     validateOnMount,
-    FormFieldGridProps,
-    FormControlProps,
-    FormLabelProps,
-    FormHelperTextProps,
+    FormFieldGridProps = {},
+    FormControlProps = {},
+    FormLabelProps = {},
+    FormHelperTextProps = {},
+    FormControlLabelProps = {},
+    RadioProps = {},
     ...rest
   } = useFieldApi({
     ...props,
@@ -87,7 +89,16 @@ const Radio = ({ name, ...props }) => {
           {label}
         </FormLabel>
         {options.map((option) => (
-          <RadioOption key={option.value} name={name} option={option} isDisabled={isDisabled} isReadOnly={isReadOnly} {...rest} />
+          <RadioOption
+            key={option.value}
+            name={name}
+            option={option}
+            isDisabled={isDisabled}
+            isReadOnly={isReadOnly}
+            FormControlLabelProps={FormControlLabelProps}
+            RadioProps={RadioProps}
+            {...rest}
+          />
         ))}
         {text && <FormHelperText {...FormHelperTextProps}>{text}</FormHelperText>}
       </FormControl>
@@ -114,14 +125,4 @@ Radio.propTypes = {
   FormHelperTextProps: PropTypes.object,
 };
 
-Radio.defaultProps = {
-  options: [],
-  FormFieldGridProps: {},
-  FormControlProps: {},
-  FormControlLabelProps: {},
-  RadioProps: {},
-  FormLabelProps: {},
-  FormHelperTextProps: {},
-};
-
 export default Radio;
diff --git a/packages/mui-component-mapper/src/select/select.js b/packages/mui-component-mapper/src/select/select.js
index 064eee77d..782a85d45 100644
--- a/packages/mui-component-mapper/src/select/select.js
+++ b/packages/mui-component-mapper/src/select/select.js
@@ -63,7 +63,7 @@ const InternalSelect = ({
   description,
   classNamePrefix,
   isMulti,
-  placeholder,
+  placeholder = 'Please choose',
   onInputChange,
   isFetching,
   noOptionsMessage,
@@ -73,11 +73,12 @@ const InternalSelect = ({
   onChange,
   onFocus,
   onBlur,
-  FormFieldGridProps,
-  TextFieldProps: { inputProps: textFieldInputProps, ...TextFieldProps },
-  inputProps,
+  FormFieldGridProps = {},
+  TextFieldProps: { inputProps: textFieldInputProps, ...TextFieldProps } = {},
+  inputProps = {},
   isClearable,
   isDisabled,
+  loadingText = 'Loading...',
   ...rest
 }) => {
   const invalid = validationError(meta, validateOnMount);
@@ -93,6 +94,7 @@ const InternalSelect = ({
         disableClearable={isClearable}
         popupIcon={isFetching ? <CircularProgress size={20} color="inherit" /> : <ArrowDropDownIcon />}
         fullWidth
+        loadingText={loadingText}
         {...rest}
         renderInput={(params) => (
           <TextField
@@ -154,14 +156,7 @@ InternalSelect.propTypes = {
   TextFieldProps: PropTypes.object,
   inputProps: PropTypes.object,
   isDisabled: PropTypes.bool,
-};
-
-InternalSelect.defaultProps = {
-  placeholder: 'Please choose',
-  FormFieldGridProps: {},
-  TextFieldProps: {},
-  inputProps: {},
-  loadingText: 'Loading...',
+  loadingText: PropTypes.node,
 };
 
 const Select = (props) => {
diff --git a/packages/mui-component-mapper/src/switch/switch.js b/packages/mui-component-mapper/src/switch/switch.js
index b6b558f26..2a78278e9 100644
--- a/packages/mui-component-mapper/src/switch/switch.js
+++ b/packages/mui-component-mapper/src/switch/switch.js
@@ -20,13 +20,13 @@ export const Switch = (props) => {
     meta,
     onText,
     offText,
-    FormFieldGridProps,
-    FormControlProps,
-    FormGroupProps,
-    FormControlLabelProps,
-    SwitchProps,
-    FormLabelProps,
-    FormHelperTextProps,
+    FormFieldGridProps = {},
+    FormControlProps = {},
+    FormGroupProps = {},
+    FormControlLabelProps = {},
+    SwitchProps = {},
+    FormLabelProps = {},
+    FormHelperTextProps = {},
     ...rest
   } = useFieldApi({
     ...props,
@@ -81,14 +81,4 @@ Switch.propTypes = {
   FormHelperTextProps: PropTypes.object,
 };
 
-Switch.defaultProps = {
-  FormFieldGridProps: {},
-  FormControlProps: {},
-  FormGroupProps: {},
-  FormControlLabelProps: {},
-  SwitchProps: {},
-  FormLabelProps: {},
-  FormHelperTextProps: {},
-};
-
 export default Switch;
diff --git a/packages/mui-component-mapper/src/tabs/tabs.js b/packages/mui-component-mapper/src/tabs/tabs.js
index 9e9851291..cbb8e8da0 100644
--- a/packages/mui-component-mapper/src/tabs/tabs.js
+++ b/packages/mui-component-mapper/src/tabs/tabs.js
@@ -6,7 +6,7 @@ import FormFieldGrid from '../form-field-grid';
 
 import { useFormApi } from '@data-driven-forms/react-form-renderer';
 
-const FormTabs = ({ fields, AppBarProps, TabsProps, TabProps, FormFieldGridProps, GridItemProps }) => {
+const FormTabs = ({ fields, AppBarProps = {}, TabsProps = {}, TabProps = {}, FormFieldGridProps = {}, GridItemProps = {} }) => {
   const formOptions = useFormApi();
   const [activeTab, setActiveTab] = useState(0);
 
@@ -45,14 +45,6 @@ FormTabs.propTypes = {
   GridItemProps: PropTypes.object,
 };
 
-FormTabs.defaultProps = {
-  AppBarProps: {},
-  TabsProps: {},
-  TabProps: {},
-  FormFieldGridProps: {},
-  GridItemProps: {},
-};
-
 export default FormTabs;
 
 /*
diff --git a/packages/mui-component-mapper/src/textarea/textarea.js b/packages/mui-component-mapper/src/textarea/textarea.js
index c85c70f0c..f379a2573 100644
--- a/packages/mui-component-mapper/src/textarea/textarea.js
+++ b/packages/mui-component-mapper/src/textarea/textarea.js
@@ -19,8 +19,8 @@ const Textarea = (props) => {
     description,
     validateOnMount,
     meta,
-    FormFieldGridProps,
-    inputProps,
+    FormFieldGridProps = {},
+    inputProps = {},
     ...rest
   } = useFieldApi(props);
   const invalid = validationError(meta, validateOnMount);
@@ -61,9 +61,4 @@ Textarea.propTypes = {
   inputProps: PropTypes.object,
 };
 
-Textarea.defaultProps = {
-  FormFieldGridProps: {},
-  inputProps: {},
-};
-
 export default Textarea;
diff --git a/packages/mui-component-mapper/src/time-picker/time-picker.js b/packages/mui-component-mapper/src/time-picker/time-picker.js
index 84de33416..3f03291ad 100644
--- a/packages/mui-component-mapper/src/time-picker/time-picker.js
+++ b/packages/mui-component-mapper/src/time-picker/time-picker.js
@@ -21,7 +21,7 @@ const TimePicker = (props) => {
     validateOnMount,
     meta,
     MuiPickersUtilsProviderProps,
-    FormFieldGridProps,
+    FormFieldGridProps = {},
     ...rest
   } = useFieldApi(props);
   const invalid = validationError(meta, validateOnMount);
@@ -79,8 +79,4 @@ TimePicker.propTypes = {
   FormFieldGridProps: PropTypes.object,
 };
 
-TimePicker.defaultProps = {
-  FormFieldGridProps: {},
-};
-
 export default TimePicker;
diff --git a/packages/mui-component-mapper/src/wizard/step-buttons.js b/packages/mui-component-mapper/src/wizard/step-buttons.js
index d1181b156..448880258 100644
--- a/packages/mui-component-mapper/src/wizard/step-buttons.js
+++ b/packages/mui-component-mapper/src/wizard/step-buttons.js
@@ -74,7 +74,7 @@ const WizardStepButtons = ({ buttons: Buttons, ...props }) => {
     handleNext,
     buttonLabels: { cancel, submit, back, next },
     formOptions,
-    ButtonContainerProps,
+    ButtonContainerProps = {},
     conditionalSubmitFlag,
   } = props;
 
@@ -139,8 +139,4 @@ WizardStepButtons.propTypes = {
   }),
 };
 
-WizardStepButtons.defaultProps = {
-  ButtonContainerProps: {},
-};
-
 export default WizardStepButtons;
diff --git a/packages/mui-component-mapper/src/wizard/wizard-nav.js b/packages/mui-component-mapper/src/wizard/wizard-nav.js
index 038ebbb18..36b5e522f 100644
--- a/packages/mui-component-mapper/src/wizard/wizard-nav.js
+++ b/packages/mui-component-mapper/src/wizard/wizard-nav.js
@@ -17,7 +17,7 @@ const StyledStepper = styled(Stepper)(() => ({
   },
 }));
 
-const WizardNav = ({ StepperProps, stepsInfo, activeStepIndex }) => (
+const WizardNav = ({ StepperProps = {}, stepsInfo, activeStepIndex }) => (
   <StyledStepper {...StepperProps} className={clsx(classes.stepper, StepperProps.className)} activeStep={activeStepIndex}>
     {stepsInfo.map(({ title, label, StepLabelProps, StepProps }, idx) => (
       <Step {...StepProps} key={idx}>
@@ -40,8 +40,4 @@ WizardNav.propTypes = {
   activeStepIndex: PropTypes.number,
 };
 
-WizardNav.defaultProps = {
-  StepperProps: {},
-};
-
 export default WizardNav;
diff --git a/packages/mui-component-mapper/src/wizard/wizard.js b/packages/mui-component-mapper/src/wizard/wizard.js
index 1e4606a65..e7a72d399 100644
--- a/packages/mui-component-mapper/src/wizard/wizard.js
+++ b/packages/mui-component-mapper/src/wizard/wizard.js
@@ -24,7 +24,15 @@ const StyledWizard = styled(Grid)(() => ({
   },
 }));
 
-const WizardInternal = ({ buttonLabels, stepsInfo, ButtonContainerProps, StepperProps, WizardBodyProps, WizardProps, conditionalSubmitFlag }) => {
+const WizardInternal = ({
+  buttonLabels,
+  stepsInfo,
+  ButtonContainerProps,
+  StepperProps,
+  WizardBodyProps = {},
+  WizardProps,
+  conditionalSubmitFlag,
+}) => {
   const { formOptions, currentStep, handlePrev, onKeyDown, handleNext, activeStepIndex, prevSteps } = useContext(WizardContext);
 
   const buttonLabelsFinal = {
@@ -72,10 +80,6 @@ WizardInternal.propTypes = {
   conditionalSubmitFlag: PropTypes.string.isRequired,
 };
 
-WizardInternal.defaultProps = {
-  WizardBodyProps: {},
-};
-
 const MuiWizard = (props) => <Wizard Wizard={WizardInternal} {...props} />;
 
 export default MuiWizard;
diff --git a/packages/pf4-component-mapper/src/field-array/field-array.js b/packages/pf4-component-mapper/src/field-array/field-array.js
index cb190c8a8..f5dd1bdda 100644
--- a/packages/pf4-component-mapper/src/field-array/field-array.js
+++ b/packages/pf4-component-mapper/src/field-array/field-array.js
@@ -69,9 +69,9 @@ const DynamicArray = ({ ...props }) => {
     fields: formFields,
     defaultItem,
     meta,
-    minItems,
-    maxItems,
-    noItemsMessage,
+    minItems = 0,
+    maxItems = Infinity,
+    noItemsMessage = 'No items added',
     buttonLabels,
     ...rest
   } = useFieldApi(props);
@@ -161,10 +161,4 @@ DynamicArray.propTypes = {
   }),
 };
 
-DynamicArray.defaultProps = {
-  maxItems: Infinity,
-  minItems: 0,
-  noItemsMessage: 'No items added',
-};
-
 export default DynamicArray;
diff --git a/packages/pf4-component-mapper/src/plain-text/plain-text.js b/packages/pf4-component-mapper/src/plain-text/plain-text.js
index 3419e9742..fea25b440 100644
--- a/packages/pf4-component-mapper/src/plain-text/plain-text.js
+++ b/packages/pf4-component-mapper/src/plain-text/plain-text.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { TextContent, Text } from '@patternfly/react-core';
 import validTextFields from '@data-driven-forms/common/utils/valid-text-fields';
 
-const PlainText = ({ component, label, name, variant, TextContentProps, ...rest }) => (
+const PlainText = ({ component, label, name, variant = 'p', TextContentProps, ...rest }) => (
   <TextContent {...TextContentProps}>
     {typeof label === 'string'
       ? label.split('\n').map((paragraph, index) => (
@@ -24,8 +24,4 @@ PlainText.propTypes = {
   component: PropTypes.string,
 };
 
-PlainText.defaultProps = {
-  variant: 'p',
-};
-
 export default PlainText;
diff --git a/packages/pf4-component-mapper/src/select/select/menu.js b/packages/pf4-component-mapper/src/select/select/menu.js
index 3286e27b4..7e8f2fea0 100644
--- a/packages/pf4-component-mapper/src/select/select/menu.js
+++ b/packages/pf4-component-mapper/src/select/select/menu.js
@@ -107,7 +107,6 @@ const Menu = ({
   filterOptions,
   isSearchable,
   filterValue,
-  options,
   getItemProps,
   getInputProps,
   highlightedIndex,
@@ -133,8 +132,18 @@ const Menu = ({
       isSelected: isMulti ? !!selectedItem.find(({ value }) => item.value === value) : selectedItem === item.value,
       onMouseUp: (e) => e.stopPropagation(), // we need this to prevent issues with portal menu not selecting a option
     });
+    let key = item.key;
+    if (!key && typeof item.value === 'object') {
+      try {
+        key = JSON.stringify(item.value);
+      } catch (error) {
+        key = index;
+      }
+    } else if (!key) {
+      key = (typeof item.label === 'string' && item.label) || index;
+    }
 
-    return <Option key={item.key || item.value || (typeof item.label === 'string' && item.label) || item} item={item} {...itemProps} />;
+    return <Option key={key} item={item} {...itemProps} />;
   };
 
   const menuItems = (
diff --git a/packages/pf4-component-mapper/src/select/select/select.js b/packages/pf4-component-mapper/src/select/select/select.js
index 17c82adfa..e56b38389 100644
--- a/packages/pf4-component-mapper/src/select/select/select.js
+++ b/packages/pf4-component-mapper/src/select/select/select.js
@@ -294,7 +294,21 @@ InternalSelect.propTypes = {
   originalOptions: PropTypes.array,
 };
 
-const Select = ({ menuIsPortal, ...props }) => {
+const Select = ({
+  showMoreLabel = 'more',
+  showLessLabel = 'Show less',
+  simpleValue = true,
+  loadingMessage = 'Loading...',
+  updatingMessage = 'Loading data...',
+  options = [],
+  menuIsPortal = false,
+  placeholder = 'Choose...',
+  isSearchable = false,
+  isClearable = false,
+  noResultsMessage = 'No results found',
+  noOptionsMessage = 'No options',
+  ...props
+}) => {
   const menuPortalTarget = menuIsPortal ? document.body : undefined;
 
   return (
@@ -303,6 +317,17 @@ const Select = ({ menuIsPortal, ...props }) => {
       menuPortalTarget={menuPortalTarget}
       menuIsPortal={menuIsPortal}
       {...props}
+      showMoreLabel={showMoreLabel}
+      showLessLabel={showLessLabel}
+      simpleValue={simpleValue}
+      loadingMessage={loadingMessage}
+      updatingMessage={updatingMessage}
+      options={options}
+      placeholder={placeholder}
+      isSearchable={isSearchable}
+      isClearable={isClearable}
+      noResultsMessage={noResultsMessage}
+      noOptionsMessage={noOptionsMessage}
       optionsTransformer={flatOptions}
     />
   );
@@ -329,21 +354,7 @@ Select.propTypes = {
   placeholder: PropTypes.string,
   noResultsMessage: PropTypes.node,
   noOptionsMessage: PropTypes.node,
-};
-
-Select.defaultProps = {
-  showMoreLabel: 'more',
-  showLessLabel: 'Show less',
-  simpleValue: true,
-  loadingMessage: 'Loading...',
-  updatingMessage: 'Loading data...',
-  options: [],
-  menuIsPortal: false,
-  placeholder: 'Choose...',
-  isSearchable: false,
-  isClearable: false,
-  noResultsMessage: 'No results found',
-  noOptionsMessage: 'No options',
+  isClearable: PropTypes.bool,
 };
 
 export default Select;
diff --git a/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-step.js b/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-step.js
index 86bba0726..28fe04461 100644
--- a/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-step.js
+++ b/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-step.js
@@ -46,7 +46,7 @@ const WizardStep = ({
   showTitle,
   customTitle,
   hasNoBodyPadding,
-  StepTemplate,
+  StepTemplate = DefaultStepTemplate,
   ...rest
 }) => {
   const formRef = useRef();
@@ -98,8 +98,4 @@ WizardStep.propTypes = {
   conditionalSubmitFlag: PropTypes.string,
 };
 
-WizardStep.defaultProps = {
-  StepTemplate: DefaultStepTemplate,
-};
-
 export default WizardStep;
diff --git a/packages/pf4-component-mapper/src/wizard/wizard.js b/packages/pf4-component-mapper/src/wizard/wizard.js
index 574869cac..ffd18b5a0 100644
--- a/packages/pf4-component-mapper/src/wizard/wizard.js
+++ b/packages/pf4-component-mapper/src/wizard/wizard.js
@@ -199,7 +199,7 @@ const defaultLabels = {
   next: 'Next',
 };
 
-const WizardFunction = ({ buttonLabels, ...props }) => (
+const WizardFunction = ({ buttonLabels = {}, ...props }) => (
   <Wizard Wizard={WizardInternal} {...props} buttonLabels={{ ...defaultLabels, ...buttonLabels }} />
 );
 
@@ -211,8 +211,4 @@ WizardFunction.propTypes = {
   }),
 };
 
-WizardFunction.defaultProps = {
-  buttonLabels: {},
-};
-
 export default WizardFunction;
diff --git a/packages/react-form-renderer/src/form-renderer/form-renderer.js b/packages/react-form-renderer/src/form-renderer/form-renderer.js
index 2d8479af9..1ae907d72 100644
--- a/packages/react-form-renderer/src/form-renderer/form-renderer.js
+++ b/packages/react-form-renderer/src/form-renderer/form-renderer.js
@@ -43,7 +43,7 @@ const FormRenderer = ({
   actionMapper,
   children,
   clearedValue,
-  clearOnUnmount,
+  clearOnUnmount = false,
   componentMapper,
   conditionMapper = {},
   decorators,
@@ -58,6 +58,7 @@ const FormRenderer = ({
   schemaValidatorMapper,
   subscription,
   validatorMapper,
+  initialValues = {},
   ...props
 }) => {
   const [fileInputs, setFileInputs] = useState([]);
@@ -172,7 +173,7 @@ const FormRenderer = ({
               ...form,
               ffGetRegisteredFields: form.getRegisteredFields,
               getRegisteredFields: internalGetRegisteredFields,
-              initialValues: props.initialValues,
+              initialValues,
               schema,
             },
           }}
@@ -183,6 +184,7 @@ const FormRenderer = ({
         </RendererContext.Provider>
       )}
       {...props}
+      initialValues={initialValues}
     />
   );
 };
@@ -227,9 +229,4 @@ FormRenderer.propTypes = {
   }),
 };
 
-FormRenderer.defaultProps = {
-  initialValues: {},
-  clearOnUnmount: false,
-};
-
 export default FormRenderer;
diff --git a/packages/react-form-renderer/src/form-renderer/render-form.js b/packages/react-form-renderer/src/form-renderer/render-form.js
index 9637a403e..1849124e4 100644
--- a/packages/react-form-renderer/src/form-renderer/render-form.js
+++ b/packages/react-form-renderer/src/form-renderer/render-form.js
@@ -8,17 +8,13 @@ import Condition from '../condition';
 import getConditionTriggers from '../get-condition-triggers';
 import prepareComponentProps from '../prepare-component-props';
 
-const FormFieldHideWrapper = ({ hideField, children }) => (hideField ? <div hidden>{children}</div> : children);
+const FormFieldHideWrapper = ({ hideField = false, children }) => (hideField ? <div hidden>{children}</div> : children);
 
 FormFieldHideWrapper.propTypes = {
   hideField: PropTypes.bool,
   children: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)]).isRequired,
 };
 
-FormFieldHideWrapper.defaultProps = {
-  hideField: false,
-};
-
 const ConditionTriggerWrapper = ({ condition, values, children, field }) => (
   <Condition condition={condition} values={values} field={field}>
     {children}
diff --git a/packages/react-renderer-demo/src/components/code-example.js b/packages/react-renderer-demo/src/components/code-example.js
index 5f586ac05..36fb3ace0 100644
--- a/packages/react-renderer-demo/src/components/code-example.js
+++ b/packages/react-renderer-demo/src/components/code-example.js
@@ -187,7 +187,7 @@ const AccordionSummary = styled((props) => {
     flexDirection: 'row-reverse',
   },
 }));
-const CodeExample = ({ source, mode }) => {
+const CodeExample = ({ source, mode = 'code' }) => {
   const [name, setName] = useState('');
   const [codeSource, setCodeSource] = useState('');
   const { current: Component } = useRef(
@@ -292,8 +292,4 @@ CodeExample.propTypes = {
   mode: PropTypes.oneOf(['code', 'preview']),
 };
 
-CodeExample.defaultProps = {
-  mode: 'code',
-};
-
 export default CodeExample;
diff --git a/packages/react-renderer-demo/src/components/component-example-text.js b/packages/react-renderer-demo/src/components/component-example-text.js
index 7e54bb755..13070a145 100644
--- a/packages/react-renderer-demo/src/components/component-example-text.js
+++ b/packages/react-renderer-demo/src/components/component-example-text.js
@@ -32,7 +32,7 @@ const Root = styled('div')(({ theme }) => ({
   },
 }));
 
-const ComponentExampleText = ({ linkText, schema, variants, schemaVariants }) => {
+const ComponentExampleText = ({ linkText, schema, variants = [], schemaVariants }) => {
   const [activeMapper, component, activeSchema] = useComponentExample();
 
   return (
@@ -63,8 +63,4 @@ ComponentExampleText.propTypes = {
   schemaVariants: PropTypes.object,
 };
 
-ComponentExampleText.defaultProps = {
-  variants: [],
-};
-
 export default ComponentExampleText;
diff --git a/packages/react-renderer-demo/src/pages/testing.md b/packages/react-renderer-demo/src/pages/testing.md
index 87ccb045d..e3efbeba2 100644
--- a/packages/react-renderer-demo/src/pages/testing.md
+++ b/packages/react-renderer-demo/src/pages/testing.md
@@ -163,7 +163,7 @@ import { FormRenderer, useFieldApi } from '@data-driven-forms/react-form-rendere
 import { FormTemplate } from '@data-driven-forms/mui-component-mapper';
 
 const CustomComponent = (props) => {
-  const { input, meta, label, sideEffect } = useFieldApi(props);
+  const { input, meta, label, sideEffect = () => {} } = useFieldApi(props);
   return (
     <div className="input-wrapper">
       <label className="input-label" htmlFor={input.name}>
@@ -186,10 +186,6 @@ const CustomComponent = (props) => {
   );
 };
 
-CustomComponent.defaultProps = {
-  sideEffect: () => {},
-};
-
 const createSchema = ({ label = 'Custom label', validate = [], ...rest }) => ({
   fields: [
     {
@@ -247,7 +243,7 @@ import userEvent from '@testing-library/user-event';
 import { Form, RendererContext, useFieldApi } from '@data-driven-forms/react-form-renderer';
 
 const CustomComponent = (props) => {
-  const { input, meta, label, sideEffect } = useFieldApi(props);
+  const { input, meta, label, sideEffect = () => {} } = useFieldApi(props);
   return (
     <div className="input-wrapper">
       <label className="input-label" htmlFor={input.name}>
@@ -270,10 +266,6 @@ const CustomComponent = (props) => {
   );
 };
 
-CustomComponent.defaultProps = {
-  sideEffect: () => {},
-};
-
 const FormWrapper = ({ props, children }) => (
   <Form onSubmit={() => {}} {...props}>
     {() => (
diff --git a/packages/suir-component-mapper/src/checkbox/checkbox.js b/packages/suir-component-mapper/src/checkbox/checkbox.js
index b61654984..25e49f5dd 100644
--- a/packages/suir-component-mapper/src/checkbox/checkbox.js
+++ b/packages/suir-component-mapper/src/checkbox/checkbox.js
@@ -18,8 +18,8 @@ export const SingleCheckbox = (props) => {
     description,
     validateOnMount,
     meta,
-    FormFieldGridProps,
-    HelperTextProps,
+    FormFieldGridProps = {},
+    HelperTextProps = {},
     ...rest
   } = useFieldApi({
     ...props,
@@ -71,9 +71,4 @@ Checkbox.propTypes = {
   HelperTextProps: PropTypes.object,
 };
 
-Checkbox.defaultProps = {
-  FormFieldGridProps: {},
-  HelperTextProps: {},
-};
-
 export default Checkbox;
diff --git a/packages/suir-component-mapper/src/checkbox/multiple-choice-list.js b/packages/suir-component-mapper/src/checkbox/multiple-choice-list.js
index e82b35bd6..e6e30853b 100644
--- a/packages/suir-component-mapper/src/checkbox/multiple-choice-list.js
+++ b/packages/suir-component-mapper/src/checkbox/multiple-choice-list.js
@@ -82,8 +82,14 @@ const Wrapper = ({ label, isRequired, children, meta, validateOnMount, helperTex
 Wrapper.propTypes = {
   ...wrapperProps,
 };
-
-const MultipleChoiceList = ({ FormFieldGridProps, FormFieldProps, HeaderProps, OptionsListProps, HelperTextProps, ...props }) => (
+const MultipleChoiceList = ({
+  FormFieldGridProps = {},
+  FormFieldProps = {},
+  HeaderProps = {},
+  OptionsListProps = {},
+  HelperTextProps = {},
+  ...props
+}) => (
   <CheckboxContext.Provider value={{ props, FormFieldGridProps, FormFieldProps, HeaderProps, OptionsListProps, HelperTextProps }}>
     <MultipleChoiceListCommon {...props} Wrapper={Wrapper} Checkbox={FinalCheckbox} />
   </CheckboxContext.Provider>
@@ -97,12 +103,4 @@ MultipleChoiceList.propTypes = {
   HelperTextProps: PropTypes.object,
 };
 
-MultipleChoiceList.defaultProps = {
-  FormFieldGridProps: {},
-  FormFieldProps: {},
-  HeaderProps: {},
-  OptionsListProps: {},
-  HelperTextProps: {},
-};
-
 export default MultipleChoiceList;
diff --git a/packages/suir-component-mapper/src/date-picker/date-picker.js b/packages/suir-component-mapper/src/date-picker/date-picker.js
index 11bd6702a..c36664222 100644
--- a/packages/suir-component-mapper/src/date-picker/date-picker.js
+++ b/packages/suir-component-mapper/src/date-picker/date-picker.js
@@ -17,8 +17,8 @@ const DatePicker = (props) => {
     helperText,
     validateOnMount,
     meta,
-    FormFieldGridProps,
-    HelperTextProps,
+    FormFieldGridProps = {},
+    HelperTextProps = {},
     ...rest
   } = useFieldApi(props);
   const invalid = validationError(meta, validateOnMount);
@@ -56,9 +56,4 @@ DatePicker.propTypes = {
   HelperTextProps: PropTypes.object,
 };
 
-DatePicker.defaultProps = {
-  FormFieldGridProps: {},
-  HelperTextProps: {},
-};
-
 export default DatePicker;
diff --git a/packages/suir-component-mapper/src/dual-list-select/dual-list-select.js b/packages/suir-component-mapper/src/dual-list-select/dual-list-select.js
index 22aec4197..b25b53381 100644
--- a/packages/suir-component-mapper/src/dual-list-select/dual-list-select.js
+++ b/packages/suir-component-mapper/src/dual-list-select/dual-list-select.js
@@ -20,13 +20,13 @@ const useListStyles = createUseStyles({
 });
 
 const List = ({
-  value,
+  value = [],
   optionClick,
   noOptionsTitle,
   filterValue,
   filterValueText,
   selectedValues,
-  OptionProps: { className, selectedClassName, ...OptionProps },
+  OptionProps: { className, selectedClassName, ...OptionProps } = {},
   ...rest
 }) => {
   const classes = useListStyles();
@@ -67,12 +67,18 @@ List.propTypes = {
   OptionProps: PropTypes.shape({ className: PropTypes.string, selectedClassName: PropTypes.string }),
 };
 
-List.defaultProps = {
-  value: [],
-  OptionProps: {},
-};
-
-const Toolbar = ({ sortTitle, onFilter, onSort, sortDirection, value, placeholder, id, sortUpIcon, sortDownIcon, ...rest }) => (
+const Toolbar = ({
+  sortTitle,
+  onFilter,
+  onSort,
+  sortDirection,
+  value,
+  placeholder,
+  id,
+  sortUpIcon = 'sort amount up',
+  sortDownIcon = 'sort amount down',
+  ...rest
+}) => (
   <div id={id}>
     <Input
       name="filterOptions"
@@ -101,11 +107,6 @@ Toolbar.propTypes = {
   sortDownIcon: PropTypes.string,
 };
 
-Toolbar.defaultProps = {
-  sortUpIcon: 'sort amount up',
-  sortDownIcon: 'sort amount down',
-};
-
 const useDualListStyles = createUseStyles({
   dualListButtons: {
     display: 'flex !important',
@@ -131,23 +132,9 @@ const useDualListStyles = createUseStyles({
 const DualList = ({
   meta,
   input,
-  allToRight,
-  allToLeft,
-  leftTitle,
-  moveAllLeftTitle,
-  moveAllRightTitle,
-  moveRightTitle,
-  moveLeftTitle,
-  rightTitle,
   label,
   isRequired,
   helperText,
-  noValueTitle,
-  noOptionsTitle,
-  filterOptionsTitle,
-  filterValueTitle,
-  filterValueText,
-  filterOptionsText,
   state,
   id,
   sortOptions,
@@ -163,21 +150,35 @@ const DualList = ({
   rightValues,
   handleValuesClick,
   validateOnMount,
-  leftSortTitle,
-  rightSortTitle,
-  OptionsListProps,
-  OptionProps,
-  LabelProps: { className: labelClassName, error: labelError, ...LabelProps },
-  ToolbarProps,
-  ButtonGridProps: { className: buttonGridClassName, ...ButtonGridProps },
-  RightButtonProps,
-  DoubleRightButtonProps,
-  LeftButtonProps,
-  DoubleLeftButtonProps,
-  OptionsHeaderProps,
-  ValuesHeaderProps,
-  HelperTextProps,
-  FormFieldGridProps,
+  LabelProps: { className: labelClassName, error: labelError, ...LabelProps } = {},
+  ButtonGridProps: { className: buttonGridClassName, ...ButtonGridProps } = {},
+  leftTitle = 'Options',
+  rightTitle = 'Selected',
+  moveLeftTitle = 'Move selected to left',
+  moveRightTitle = 'Move selected to right',
+  moveAllRightTitle = 'Move all to right',
+  moveAllLeftTitle = 'Move all to left',
+  noOptionsTitle = 'No available options',
+  noValueTitle = 'No selected',
+  filterOptionsTitle = 'Filter options',
+  filterValueTitle = 'Filter selected value',
+  filterOptionsText = 'Remove your filter to see all options',
+  filterValueText = 'Remove your filter to see all selected',
+  leftSortTitle = 'Sort options',
+  rightSortTitle = 'Sort value',
+  allToLeft = true,
+  allToRight = true,
+  OptionsListProps = {},
+  OptionProps = {},
+  ToolbarProps = {},
+  RightButtonProps = {},
+  DoubleRightButtonProps = {},
+  LeftButtonProps = {},
+  DoubleLeftButtonProps = {},
+  OptionsHeaderProps = {},
+  ValuesHeaderProps = {},
+  HelperTextProps = {},
+  FormFieldGridProps = {},
 }) => {
   const invalid = validationError(meta, validateOnMount);
   const classes = useDualListStyles();
@@ -377,39 +378,6 @@ DualList.propTypes = {
   FormFieldGridProps: PropTypes.object,
 };
 
-DualList.defaultProps = {
-  leftTitle: 'Options',
-  rightTitle: 'Selected',
-  moveLeftTitle: 'Move selected to left',
-  moveRightTitle: 'Move selected to right',
-  moveAllRightTitle: 'Move all to right',
-  moveAllLeftTitle: 'Move all to left',
-  noOptionsTitle: 'No available options',
-  noValueTitle: 'No selected',
-  filterOptionsTitle: 'Filter options',
-  filterValueTitle: 'Filter selected value',
-  filterOptionsText: 'Remove your filter to see all options',
-  filterValueText: 'Remove your filter to see all selected',
-  leftSortTitle: 'Sort options',
-  rightSortTitle: 'Sort value',
-  options: [],
-  allToLeft: true,
-  allToRight: true,
-  OptionsListProps: {},
-  OptionProps: {},
-  LabelProps: {},
-  ToolbarProps: {},
-  ButtonGridProps: {},
-  RightButtonProps: {},
-  DoubleRightButtonProps: {},
-  LeftButtonProps: {},
-  DoubleLeftButtonProps: {},
-  OptionsHeaderProps: {},
-  ValuesHeaderProps: {},
-  HelperTextProps: {},
-  FormFieldGridProps: {},
-};
-
 const DualListSelectWrapper = (props) => <DualListSelectCommon {...props} DualListSelect={DualList} />;
 
 export default DualListSelectWrapper;
diff --git a/packages/suir-component-mapper/src/field-array/field-array.js b/packages/suir-component-mapper/src/field-array/field-array.js
index 9b9ded809..3a502b6b7 100644
--- a/packages/suir-component-mapper/src/field-array/field-array.js
+++ b/packages/suir-component-mapper/src/field-array/field-array.js
@@ -47,9 +47,9 @@ const ArrayItem = memo(
     length,
     minItems,
     removeLabel,
-    RemoveButtonProps,
-    ArrayItemGridProps: { className: arrayItemClassName, ...ArrayItemGridProps },
-    ArrayItemFieldsGridProps,
+    RemoveButtonProps = {},
+    ArrayItemGridProps: { className: arrayItemClassName, ...ArrayItemGridProps } = {},
+    ArrayItemFieldsGridProps = {},
   }) => {
     const { renderForm } = useFormApi();
     const classes = useStyles();
@@ -93,12 +93,6 @@ ArrayItem.propTypes = {
   ArrayItemFieldsGridProps: PropTypes.object,
 };
 
-ArrayItem.defaultProps = {
-  RemoveButtonProps: {},
-  ArrayItemGridProps: {},
-  ArrayItemFieldsGridProps: {},
-};
-
 const defaultButtonLabels = {
   add: 'ADD',
   remove: 'REMOVE',
@@ -144,23 +138,23 @@ const DynamicArray = ({ ...props }) => {
     fields: formFields,
     defaultItem,
     meta,
-    minItems,
-    maxItems,
-    noItemsMessage,
+    minItems = 0,
+    maxItems = Infinity,
+    noItemsMessage = 'No items added',
     buttonLabels,
-    FieldArrayGridProps,
-    FieldArrayHeaderProps: { className: arrayHeaderClassName, ...FieldArrayHeaderProps },
-    FieldArrayButtonGridProps: { className: arrayButtonGridClassName, ...FieldArrayButtonGridProps },
-    ButtonGroupProps,
-    UndoButtonProps,
-    RedoButtonProps,
-    AddButtonProps,
-    DescriptionProps: { className: descriptionClassName, ...DescriptionProps },
-    ArrayItemsGridProps: { className: arrayItemsClassName, ...ArrayItemsGridProps },
-    NoItemsProps: { className: noItemsClassname, ...NoItemsProps },
-    RemoveButtonProps,
-    ArrayItemGridProps,
-    ArrayItemFieldsGridProps,
+    FieldArrayGridProps = {},
+    FieldArrayHeaderProps: { className: arrayHeaderClassName, ...FieldArrayHeaderProps } = {},
+    FieldArrayButtonGridProps: { className: arrayButtonGridClassName, ...FieldArrayButtonGridProps } = {},
+    ButtonGroupProps = {},
+    UndoButtonProps = {},
+    RedoButtonProps = {},
+    AddButtonProps = {},
+    DescriptionProps: { className: descriptionClassName, ...DescriptionProps } = {},
+    ArrayItemsGridProps: { className: arrayItemsClassName, ...ArrayItemsGridProps } = {},
+    NoItemsProps: { className: noItemsClassname, ...NoItemsProps } = {},
+    RemoveButtonProps = {},
+    ArrayItemGridProps = {},
+    ArrayItemFieldsGridProps = {},
     ...rest
   } = useFieldApi(props);
   const [state, dispatch] = useReducer(reducer, initialState);
@@ -320,23 +314,4 @@ DynamicArray.propTypes = {
   ArrayItemFieldsGridProps: PropTypes.object,
 };
 
-DynamicArray.defaultProps = {
-  maxItems: Infinity,
-  minItems: 0,
-  noItemsMessage: 'No items added',
-  FieldArrayGridProps: {},
-  FieldArrayHeaderProps: {},
-  FieldArrayButtonGridProps: {},
-  ButtonGroupProps: {},
-  UndoButtonProps: {},
-  RedoButtonProps: {},
-  AddButtonProps: {},
-  DescriptionProps: {},
-  ArrayItemsGridProps: {},
-  NoItemsProps: {},
-  RemoveButtonProps: {},
-  ArrayItemGridProps: {},
-  ArrayItemFieldsGridProps: {},
-};
-
 export default DynamicArray;
diff --git a/packages/suir-component-mapper/src/plain-text/plain-text.js b/packages/suir-component-mapper/src/plain-text/plain-text.js
index 3d36cadd4..7c54e848b 100644
--- a/packages/suir-component-mapper/src/plain-text/plain-text.js
+++ b/packages/suir-component-mapper/src/plain-text/plain-text.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import validTextFields from '@data-driven-forms/common/utils/valid-text-fields';
 
-const PlainText = ({ variant, label, name, ...rest }) =>
+const PlainText = ({ variant = 'p', label, name, ...rest }) =>
   typeof label === 'string'
     ? label.split('\n').map((paragraph, index) => React.createElement(variant, { key: `${name}-${index}`, ...rest }, paragraph))
     : { label };
@@ -13,8 +13,4 @@ PlainText.propTypes = {
   name: PropTypes.string.isRequired,
 };
 
-PlainText.defaultProps = {
-  variant: 'p',
-};
-
 export default PlainText;
diff --git a/packages/suir-component-mapper/src/radio/radio.js b/packages/suir-component-mapper/src/radio/radio.js
index 92ec9f56b..5c3a2914b 100644
--- a/packages/suir-component-mapper/src/radio/radio.js
+++ b/packages/suir-component-mapper/src/radio/radio.js
@@ -31,7 +31,7 @@ RadioOption.propTypes = {
 
 const Radio = ({ name, ...props }) => {
   const {
-    options,
+    options = [],
     isDisabled,
     label,
     isRequired,
@@ -40,9 +40,9 @@ const Radio = ({ name, ...props }) => {
     isReadOnly,
     meta,
     validateOnMount,
-    FormFieldGridProps,
-    FormFieldProps,
-    HelperTextProps,
+    FormFieldGridProps = {},
+    FormFieldProps = {},
+    HelperTextProps = {},
     ...rest
   } = useFieldApi({
     ...props,
@@ -84,11 +84,4 @@ Radio.propTypes = {
   HelperTextProps: PropTypes.object,
 };
 
-Radio.defaultProps = {
-  options: [],
-  FormFieldGridProps: {},
-  FormFieldProps: {},
-  HelperTextProps: {},
-};
-
 export default Radio;
diff --git a/packages/suir-component-mapper/src/select/select.js b/packages/suir-component-mapper/src/select/select.js
index 34f821426..5f6c2bc1e 100644
--- a/packages/suir-component-mapper/src/select/select.js
+++ b/packages/suir-component-mapper/src/select/select.js
@@ -20,18 +20,19 @@ const SuirSelect = ({
   isDisabled,
   isClearable,
   isSearchable,
-  options,
+  options = [],
   label,
   isMulti,
   isRequired,
   classNamePrefix,
   onInputChange,
   isFetching,
-  noOptionsMessage,
+  noOptionsMessage = 'No option found',
   hideSelectedOptions,
   closeMenuOnSelect,
-  FormFieldGridProps,
-  HelpertextProps,
+  FormFieldGridProps = {},
+  HelpertextProps = {},
+  placeholder = 'Please choose',
   ...rest
 }) => {
   const invalid = validationError(meta, validateOnMount);
@@ -68,6 +69,7 @@ const SuirSelect = ({
         error={invalid && { content: meta.error || meta.submitError }}
         control={Dropdown}
         value={internalValue}
+        placeholder={placeholder}
         {...rest}
       />
     </FormFieldGrid>
@@ -102,14 +104,6 @@ SuirSelect.propTypes = {
   HelpertextProps: PropTypes.object,
 };
 
-SuirSelect.defaultProps = {
-  placeholder: 'Please choose',
-  noOptionsMessage: 'No option found',
-  options: [],
-  FormFieldGridProps: {},
-  HelpertextProps: {},
-};
-
 const Select = (props) => {
   const { input, ...formProps } = useFieldApi(props);
   return <CommonSelect simpleValue {...input} {...formProps} SelectComponent={SuirSelect} />;
diff --git a/packages/suir-component-mapper/src/sub-form/sub-form.js b/packages/suir-component-mapper/src/sub-form/sub-form.js
index 43ccb4c5b..05d8ca95e 100644
--- a/packages/suir-component-mapper/src/sub-form/sub-form.js
+++ b/packages/suir-component-mapper/src/sub-form/sub-form.js
@@ -8,9 +8,9 @@ const SubForm = ({
   title,
   description,
   component,
-  HeaderProps,
-  DescriptionProps: { element: descriptionElement, ...DescriptionProps },
-  FormFieldsGridProps: { element: formFieldsGridElement, ...FormFieldsGridProps },
+  HeaderProps = {},
+  DescriptionProps: { element: descriptionElement, ...DescriptionProps } = { element: 'p' },
+  FormFieldsGridProps: { element: formFieldsGridElement, ...FormFieldsGridProps } = { element: 'div' },
   ...rest
 }) => {
   const { renderForm } = useFormApi();
@@ -34,10 +34,4 @@ SubForm.propTypes = {
   FormFieldsGridProps: PropTypes.shape({ element: PropTypes.string.isRequired }),
 };
 
-SubForm.defaultProps = {
-  HeaderProps: {},
-  DescriptionProps: { element: 'p' },
-  FormFieldsGridProps: { element: 'div' },
-};
-
 export default SubForm;
diff --git a/packages/suir-component-mapper/src/switch/switch.js b/packages/suir-component-mapper/src/switch/switch.js
index 0edb921e1..1bf90e9f1 100644
--- a/packages/suir-component-mapper/src/switch/switch.js
+++ b/packages/suir-component-mapper/src/switch/switch.js
@@ -37,8 +37,8 @@ export const Switch = (props) => {
     onText,
     offText,
     className,
-    FormFieldGridProps,
-    HelpertextProps,
+    FormFieldGridProps = {},
+    HelpertextProps = {},
     type,
     ...rest
   } = useFieldApi({
@@ -87,9 +87,4 @@ Switch.propTypes = {
   HelpertextProps: PropTypes.object,
 };
 
-Switch.defaultProps = {
-  FormFieldGridProps: {},
-  HelpertextProps: {},
-};
-
 export default Switch;
diff --git a/packages/suir-component-mapper/src/tabs/tabs.js b/packages/suir-component-mapper/src/tabs/tabs.js
index 9ab1f4483..91a0efbc8 100644
--- a/packages/suir-component-mapper/src/tabs/tabs.js
+++ b/packages/suir-component-mapper/src/tabs/tabs.js
@@ -12,7 +12,7 @@ TabContent.propTypes = {
   formOptions: PropTypes.shape({ renderForm: PropTypes.func.isRequired }).isRequired,
 };
 
-const FormTabs = ({ fields, TabProps, TabPaneProps }) => {
+const FormTabs = ({ fields, TabProps = {}, TabPaneProps = {} }) => {
   const formOptions = useFormApi();
 
   const panes = fields.map((field, index) => ({
@@ -32,9 +32,4 @@ FormTabs.propTypes = {
   TabPaneProps: PropTypes.object,
 };
 
-FormTabs.defaultProps = {
-  TabProps: {},
-  TabPaneProps: {},
-};
-
 export default FormTabs;
diff --git a/packages/suir-component-mapper/src/text-field/text-field.js b/packages/suir-component-mapper/src/text-field/text-field.js
index ea47fcbe1..5d70c176a 100644
--- a/packages/suir-component-mapper/src/text-field/text-field.js
+++ b/packages/suir-component-mapper/src/text-field/text-field.js
@@ -18,8 +18,8 @@ const TextField = (props) => {
     helperText,
     validateOnMount,
     meta,
-    FormFieldGridProps,
-    HelpertextProps,
+    FormFieldGridProps = {},
+    HelpertextProps = {},
     ...rest
   } = useFieldApi(props);
   const invalid = validationError(meta, validateOnMount);
@@ -58,9 +58,4 @@ TextField.propTypes = {
   HelpertextProps: PropTypes.object,
 };
 
-TextField.defaultProps = {
-  FormFieldGridProps: {},
-  HelpertextProps: {},
-};
-
 export default TextField;
diff --git a/packages/suir-component-mapper/src/textarea/textarea.js b/packages/suir-component-mapper/src/textarea/textarea.js
index cc633576c..ed773e7ee 100644
--- a/packages/suir-component-mapper/src/textarea/textarea.js
+++ b/packages/suir-component-mapper/src/textarea/textarea.js
@@ -8,8 +8,19 @@ import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import FormField from '../form-field/form-field';
 
 const Textarea = (props) => {
-  const { input, isReadOnly, isDisabled, placeholder, isRequired, helperText, validateOnMount, meta, FormFieldGridProps, HelpertextProps, ...rest } =
-    useFieldApi(props);
+  const {
+    input,
+    isReadOnly,
+    isDisabled,
+    placeholder,
+    isRequired,
+    helperText,
+    validateOnMount,
+    meta,
+    FormFieldGridProps = {},
+    HelpertextProps = {},
+    ...rest
+  } = useFieldApi(props);
   const invalid = validationError(meta, validateOnMount);
   return (
     <FormFieldGrid helperText={validationWarning(meta, validateOnMount) || helperText} HelpertextProps={HelpertextProps} {...FormFieldGridProps}>
@@ -40,9 +51,4 @@ Textarea.propTypes = {
   HelpertextProps: PropTypes.object,
 };
 
-Textarea.defaultProps = {
-  FormFieldGridProps: {},
-  HelpertextProps: {},
-};
-
 export default Textarea;
diff --git a/packages/suir-component-mapper/src/time-picker/time-picker.js b/packages/suir-component-mapper/src/time-picker/time-picker.js
index e30ae18f3..9dfc277b5 100644
--- a/packages/suir-component-mapper/src/time-picker/time-picker.js
+++ b/packages/suir-component-mapper/src/time-picker/time-picker.js
@@ -7,8 +7,18 @@ import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import FormField from '../form-field/form-field';
 
 const TimePicker = (props) => {
-  const { input, isReadOnly, isDisabled, isRequired, helperText, validateOnMount, meta, FormFieldGridProps, HelpertextProps, ...rest } =
-    useFieldApi(props);
+  const {
+    input,
+    isReadOnly,
+    isDisabled,
+    isRequired,
+    helperText,
+    validateOnMount,
+    meta,
+    FormFieldGridProps = {},
+    HelpertextProps = {},
+    ...rest
+  } = useFieldApi(props);
   const invalid = validationError(meta, validateOnMount);
 
   return (
@@ -46,9 +56,4 @@ TimePicker.propTypes = {
   HelpertextProps: PropTypes.object,
 };
 
-TimePicker.defaultProps = {
-  FormFieldGridProps: {},
-  HelpertextProps: {},
-};
-
 export default TimePicker;