diff --git a/packages/evershop/src/components/frontStore/checkout/checkout/payment/paymentStep/StepContent.jsx b/packages/evershop/src/components/frontStore/checkout/checkout/payment/paymentStep/StepContent.jsx
index 7c29c73c2..3d767ea1b 100644
--- a/packages/evershop/src/components/frontStore/checkout/checkout/payment/paymentStep/StepContent.jsx
+++ b/packages/evershop/src/components/frontStore/checkout/checkout/payment/paymentStep/StepContent.jsx
@@ -204,7 +204,7 @@ export function StepContent({
 StepContent.propTypes = {
   cart: PropTypes.shape({
     billingAddress: PropTypes.shape({
-      id: PropTypes.string,
+      id: PropTypes.number,
       fullName: PropTypes.string,
       postcode: PropTypes.string,
       telephone: PropTypes.string,
diff --git a/packages/evershop/src/components/frontStore/widgets/CollectionProducts.jsx b/packages/evershop/src/components/frontStore/widgets/CollectionProducts.jsx
index 97c070aaa..add4704da 100644
--- a/packages/evershop/src/components/frontStore/widgets/CollectionProducts.jsx
+++ b/packages/evershop/src/components/frontStore/widgets/CollectionProducts.jsx
@@ -41,7 +41,7 @@ CollectionProducts.propTypes = {
           image: PropTypes.shape({
             alt: PropTypes.string.isRequired,
             url: PropTypes.string.isRequired
-          }).isRequired,
+          }),
           url: PropTypes.string.isRequired
         })
       ).isRequired
diff --git a/packages/evershop/src/modules/catalog/pages/frontStore/productView/Form.jsx b/packages/evershop/src/modules/catalog/pages/frontStore/productView/Form.jsx
index c9dbbea4b..7611285aa 100644
--- a/packages/evershop/src/modules/catalog/pages/frontStore/productView/Form.jsx
+++ b/packages/evershop/src/modules/catalog/pages/frontStore/productView/Form.jsx
@@ -80,10 +80,14 @@ ToastMessage.propTypes = {
   count: PropTypes.number.isRequired,
   name: PropTypes.string.isRequired,
   qty: PropTypes.number.isRequired,
-  thumbnail: PropTypes.string.isRequired,
+  thumbnail: PropTypes.string,
   toastId: PropTypes.string.isRequired
 };
 
+ToastMessage.defaultProps = {
+  thumbnail: null
+};
+
 function AddToCart({ stockAvaibility, loading = false, error }) {
   return (
     <div className="add-to-cart mt-8">
diff --git a/packages/evershop/src/modules/catalog/pages/frontStore/productView/Images.jsx b/packages/evershop/src/modules/catalog/pages/frontStore/productView/Images.jsx
index ff846b3a5..09a494f34 100644
--- a/packages/evershop/src/modules/catalog/pages/frontStore/productView/Images.jsx
+++ b/packages/evershop/src/modules/catalog/pages/frontStore/productView/Images.jsx
@@ -29,7 +29,11 @@ Current.propTypes = {
   image: PropTypes.shape({
     alt: PropTypes.string,
     single: PropTypes.string.isRequired
-  }).isRequired
+  })
+};
+
+Current.defaultProps = {
+  image: null
 };
 
 export default function Images({ product: { uuid, image, gallery = [] } }) {
diff --git a/packages/evershop/src/modules/checkout/pages/frontStore/checkout/ShippingNote.jsx b/packages/evershop/src/modules/checkout/pages/frontStore/checkout/ShippingNote.jsx
index aec5cfed6..188ec7a56 100644
--- a/packages/evershop/src/modules/checkout/pages/frontStore/checkout/ShippingNote.jsx
+++ b/packages/evershop/src/modules/checkout/pages/frontStore/checkout/ShippingNote.jsx
@@ -23,7 +23,7 @@ export default function ShippingNote({
             name="note"
             placeholder={_('Add a note to your order')}
             onChange={(e) => setNote(e.target.value)}
-            value={note}
+            value={note || ''}
           />
           <div className="field-border" />
         </div>
diff --git a/packages/evershop/src/modules/paypal/pages/frontStore/checkout/Paypal.jsx b/packages/evershop/src/modules/paypal/pages/frontStore/checkout/Paypal.jsx
index 26e472e5f..92f12c9ec 100644
--- a/packages/evershop/src/modules/paypal/pages/frontStore/checkout/Paypal.jsx
+++ b/packages/evershop/src/modules/paypal/pages/frontStore/checkout/Paypal.jsx
@@ -126,7 +126,7 @@ export default function PaypalMethod({ createOrderAPI }) {
         </RenderIfTrue>
         <RenderIfTrue
           condition={
-            selectedPaymentMethod && selectedPaymentMethod.code === 'paypal'
+            !!selectedPaymentMethod && selectedPaymentMethod.code === 'paypal'
           }
         >
           <div>
@@ -153,7 +153,7 @@ export default function PaypalMethod({ createOrderAPI }) {
       <div>
         <RenderIfTrue
           condition={
-            selectedPaymentMethod && selectedPaymentMethod.code === 'paypal'
+            !!selectedPaymentMethod && selectedPaymentMethod.code === 'paypal'
           }
         >
           <div>