diff --git a/lib/core/address_validator.dart b/lib/core/address_validator.dart
index 994c67093..11e4e66fb 100644
--- a/lib/core/address_validator.dart
+++ b/lib/core/address_validator.dart
@@ -276,7 +276,6 @@ class AddressValidator extends TextValidator {
             '|([^0-9a-zA-Z]|^)((bc|tb)1q[ac-hj-np-z02-9]{40,80})([^0-9a-zA-Z]|\$)' //P2wshAddress type
             '|([^0-9a-zA-Z]|^)((bc|tb)1p([ac-hj-np-z02-9]{39}|[ac-hj-np-z02-9]{59}|[ac-hj-np-z02-9]{8,89}))([^0-9a-zA-Z]|\$)'; //P2trAddress type
       case CryptoCurrency.btcln:
-        // bolt11:
         return '(lnbc|LNBC)([0-9]{1,}[a-zA-Z0-9]+)([^0-9a-zA-Z]|\$)';
       case CryptoCurrency.ltc:
         return '([^0-9a-zA-Z]|^)^L[a-zA-Z0-9]{26,33}([^0-9a-zA-Z]|\$)'
diff --git a/lib/src/screens/exchange/widgets/exchange_card.dart b/lib/src/screens/exchange/widgets/exchange_card.dart
index 055ea1a99..df56e960a 100644
--- a/lib/src/screens/exchange/widgets/exchange_card.dart
+++ b/lib/src/screens/exchange/widgets/exchange_card.dart
@@ -274,9 +274,7 @@ class ExchangeCardState extends State<ExchangeCard> {
                                   color: Theme.of(context)
                                       .extension<ExchangePageTheme>()!
                                       .hintTextColor),
-                              validator: _isAmountEditable
-                                      ? widget.currencyValueValidator
-                                      : null),
+                              validator: _isAmountEditable ? widget.currencyValueValidator : null),
                         ),
                       ),
                       if (widget.hasAllAmount)
@@ -422,8 +420,7 @@ class ExchangeCardState extends State<ExchangeCard> {
                                                       arguments: widget.initialCurrency,
                                                     );
 
-                                                    if (contact is ContactBase &&
-                                                        contact.address != null) {
+                                                    if (contact is ContactBase) {
                                                       setState(() =>
                                                           addressController.text = contact.address);
                                                       widget.onPushAddressBookButton?.call(context);
diff --git a/lib/view_model/lightning_invoice_page_view_model.dart b/lib/view_model/lightning_invoice_page_view_model.dart
index eb09e6f97..65c4fd9b1 100644
--- a/lib/view_model/lightning_invoice_page_view_model.dart
+++ b/lib/view_model/lightning_invoice_page_view_model.dart
@@ -84,7 +84,7 @@ abstract class LightningInvoicePageViewModelBase with Store {
         state = FailureState('Amount is too small');
         return;
       }
-      if (maximum != null && amountInCrypto > maximum!) {
+      if (amountInCrypto > 4000000) {
         state = FailureState('Amount is too big');
         return;
       }