diff --git a/lib/db/main_db.dart b/lib/db/main_db.dart
index be343fe7e..56d802473 100644
--- a/lib/db/main_db.dart
+++ b/lib/db/main_db.dart
@@ -32,6 +32,7 @@ class MainDB {
       // inspector: kDebugMode,
       inspector: false,
       name: "wallet_data",
+      maxSizeMiB: 512,
     );
     return true;
   }
diff --git a/lib/main.dart b/lib/main.dart
index ac8c62221..6105ec8f2 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -106,6 +106,7 @@ void main() async {
       [LogSchema],
       directory: (await StackFileSystem.applicationIsarDirectory()).path,
       inspector: false,
+      maxSizeMiB: 512,
     );
     await Logging.instance.init(isar);
     await DebugService.instance.init(isar);
diff --git a/lib/services/exchange/exchange_data_loading_service.dart b/lib/services/exchange/exchange_data_loading_service.dart
index f6d2876c9..469af3c54 100644
--- a/lib/services/exchange/exchange_data_loading_service.dart
+++ b/lib/services/exchange/exchange_data_loading_service.dart
@@ -48,9 +48,10 @@ class ExchangeDataLoadingService {
         PairSchema,
       ],
       directory: (await StackFileSystem.applicationIsarDirectory()).path,
-      inspector: kDebugMode,
-      // inspector: false,
+      // inspector: kDebugMode,
+      inspector: false,
       name: "exchange_cache",
+      maxSizeMiB: 256,
     );
   }
 
@@ -114,12 +115,16 @@ class ExchangeDataLoadingService {
       try {
         await Future.wait([
           _loadChangeNowCurrencies(),
-          _loadChangeNowFixedRatePairs(),
-          _loadChangeNowEstimatedRatePairs(),
+          // _loadChangeNowFixedRatePairs(),
+          // _loadChangeNowEstimatedRatePairs(),
           // loadSimpleswapFixedRateCurrencies(ref),
           // loadSimpleswapFloatingRateCurrencies(ref),
           loadMajesticBankCurrencies(),
         ]);
+
+        await _loadChangeNowFixedRatePairs();
+        await _loadChangeNowEstimatedRatePairs();
+
         Logging.instance.log(
           "ExchangeDataLoadingService.loadAll finished in ${DateTime.now().difference(start).inSeconds} seconds",
           level: LogLevel.Info,
diff --git a/lib/utilities/flutter_secure_storage_interface.dart b/lib/utilities/flutter_secure_storage_interface.dart
index 16fa98760..3c49ebd28 100644
--- a/lib/utilities/flutter_secure_storage_interface.dart
+++ b/lib/utilities/flutter_secure_storage_interface.dart
@@ -62,6 +62,7 @@ class DesktopSecureStore {
       directory: (await StackFileSystem.applicationIsarDirectory()).path,
       inspector: false,
       name: "desktopStore",
+      maxSizeMiB: 512,
     );
   }
 
diff --git a/lib/utilities/logger.dart b/lib/utilities/logger.dart
index 86bfef91e..c6e04f0ef 100644
--- a/lib/utilities/logger.dart
+++ b/lib/utilities/logger.dart
@@ -35,6 +35,7 @@ class Logging {
     isar = await Isar.open(
       [LogSchema],
       inspector: false,
+      maxSizeMiB: 512,
     );
   }