diff --git a/packages/p2p/src/components/buy-sell/buy-sell-form.jsx b/packages/p2p/src/components/buy-sell/buy-sell-form.jsx
index d257be0dc927..040667a9ac8b 100644
--- a/packages/p2p/src/components/buy-sell/buy-sell-form.jsx
+++ b/packages/p2p/src/components/buy-sell/buy-sell-form.jsx
@@ -129,7 +129,7 @@ const BuySellForm = props => {
                 validate={buy_sell_store.validatePopup}
                 validateOnMount={!should_disable_field}
                 initialValues={{
-                    amount: input_amount,
+                    amount: min_order_amount_limit,
                     contact_info: buy_sell_store.contact_info,
                     payment_info: buy_sell_store.payment_info,
                     rate: rate_type === ad_type.FLOAT ? effective_rate : null,
@@ -137,7 +137,7 @@ const BuySellForm = props => {
                 initialErrors={buy_sell_store.is_sell_advert ? { contact_info: true } : {}}
                 onSubmit={(...args) => buy_sell_store.handleSubmit(() => isMounted(), ...args)}
             >
-                {({ errors, isSubmitting, isValid, setFieldValue, submitForm, touched, values }) => {
+                {({ errors, isSubmitting, isValid, setFieldValue, submitForm, touched }) => {
                     buy_sell_store.form_props.setIsSubmitDisabled(
                         !isValid ||
                             isSubmitting ||
@@ -379,7 +379,7 @@ const BuySellForm = props => {
                                                     onChange={event => {
                                                         if (event.target.value === '') {
                                                             setFieldValue('amount', '');
-                                                            setInputAmount(0);
+                                                            setInputAmount('');
                                                         } else {
                                                             const amount = getRoundedNumber(
                                                                 event.target.value,
@@ -390,7 +390,7 @@ const BuySellForm = props => {
                                                         }
                                                     }}
                                                     required
-                                                    value={values.amount}
+                                                    value={input_amount}
                                                     disabled={should_disable_field}
                                                 />
                                             )}