diff --git a/analysis_options.yaml b/analysis_options.yaml
index 139f2b9bb..a217eaf08 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -6,8 +6,8 @@ analyzer:
     implicit-dynamic: false
   exclude:
     - "build/**"
-    - "**/*.g.dart"
     - "lib/generated/*.dart"
+    - "**.g.dart"
 
 linter:
   rules:
diff --git a/cw_monero/lib/subaddress_list.dart b/cw_monero/lib/subaddress_list.dart
index e6ad85dd0..29d864494 100644
--- a/cw_monero/lib/subaddress_list.dart
+++ b/cw_monero/lib/subaddress_list.dart
@@ -30,7 +30,6 @@ void refreshSubaddresses({int accountIndex}) =>
     subaddressRefreshNative(accountIndex);
 
 List<SubaddressRow> getAllSubaddresses() {
-  refreshSubaddresses(accountIndex: 0);
   final size = subaddressSizeNative();
   final subaddressAddressesPointer = subaddrressGetAllNative();
   final subaddressAddresses = subaddressAddressesPointer.asTypedList(size);