diff --git a/cw_bitcoin/lib/litecoin_wallet_addresses.dart b/cw_bitcoin/lib/litecoin_wallet_addresses.dart
index b657ce60d..51944a71c 100644
--- a/cw_bitcoin/lib/litecoin_wallet_addresses.dart
+++ b/cw_bitcoin/lib/litecoin_wallet_addresses.dart
@@ -75,6 +75,10 @@ abstract class LitecoinWalletAddressesBase extends ElectrumWalletAddresses with
   Future<void> initMwebAddresses() async {
     print("Initializing MWEB address timer!");
     Timer.periodic(const Duration(seconds: 2), (timer) async {
+      if (super.allAddresses.length > 1000) {
+        timer.cancel();
+        return;
+      }
       print("Generating MWEB addresses...");
       await generateNumAddresses(250);
       await Future.delayed(const Duration(milliseconds: 1500));
@@ -95,6 +99,7 @@ abstract class LitecoinWalletAddressesBase extends ElectrumWalletAddresses with
         addAddresses(mwebAddresses);
         print("MWEB addresses initialized ${mwebAddrs.length}");
         timer.cancel();
+        return;
       }
     });
   }
diff --git a/lib/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart b/lib/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart
index 42e701bb4..236d06f4e 100644
--- a/lib/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart
+++ b/lib/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart
@@ -103,10 +103,10 @@ class UnspentCoinsListItem extends StatelessWidget {
                           ),
                           maxLines: 1,
                         ),
-                        // Row(
-                        //   mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                        //   children: [
-                            if (isChange || true)
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                          children: [
+                            if (isChange)
                               Container(
                                 height: 17,
                                 padding: EdgeInsets.only(left: 6, right: 6),
@@ -123,7 +123,7 @@ class UnspentCoinsListItem extends StatelessWidget {
                                   ),
                                 ),
                               ),
-                            if (address.toLowerCase().contains("mweb") || true)
+                            if (address.toLowerCase().contains("mweb"))
                               Container(
                                 height: 17,
                                 padding: EdgeInsets.only(left: 6, right: 6),
@@ -141,7 +141,7 @@ class UnspentCoinsListItem extends StatelessWidget {
                                   ),
                                 ),
                               ),
-                            if (isSilentPayment || true)
+                            if (isSilentPayment)
                               Container(
                                 height: 17,
                                 padding: EdgeInsets.only(left: 6, right: 6),
@@ -158,8 +158,8 @@ class UnspentCoinsListItem extends StatelessWidget {
                                   ),
                                 ),
                               ),
-                          // ],
-                        // ),
+                          ],
+                        ),
                       ],
                     ),
                   ),