diff --git a/lib/extensions/album_simple.dart b/lib/extensions/album_simple.dart
index a717bf88..00db4dca 100644
--- a/lib/extensions/album_simple.dart
+++ b/lib/extensions/album_simple.dart
@@ -3,7 +3,7 @@ import 'package:spotify/spotify.dart';
 extension AlbumJson on AlbumSimple {
   Map<String, dynamic> toJson() {
     return {
-      "albumType": albumType,
+      "albumType": albumType?.name,
       "id": id,
       "name": name,
       "images": images
diff --git a/lib/models/local_track.dart b/lib/models/local_track.dart
index b973cdbb..e297e974 100644
--- a/lib/models/local_track.dart
+++ b/lib/models/local_track.dart
@@ -40,7 +40,7 @@ class LocalTrack extends Track {
     return {
       "album": album?.toJson(),
       "artists": artists?.map((artist) => artist.toJson()).toList(),
-      "availableMarkets": availableMarkets,
+      "availableMarkets": availableMarkets?.map((m) => m.name),
       "discNumber": discNumber,
       "duration": duration.toString(),
       "durationMs": durationMs,
diff --git a/lib/models/spotube_track.dart b/lib/models/spotube_track.dart
index 6ef240df..a0c5f132 100644
--- a/lib/models/spotube_track.dart
+++ b/lib/models/spotube_track.dart
@@ -250,7 +250,7 @@ class SpotubeTrack extends Track {
       // super values
       "album": album?.toJson(),
       "artists": artists?.map((artist) => artist.toJson()).toList(),
-      "availableMarkets": availableMarkets,
+      "availableMarkets": availableMarkets?.map((m) => m.name),
       "discNumber": discNumber,
       "duration": duration.toString(),
       "durationMs": durationMs,
diff --git a/lib/pages/settings/settings.dart b/lib/pages/settings/settings.dart
index e346bc2d..05c9a7c8 100644
--- a/lib/pages/settings/settings.dart
+++ b/lib/pages/settings/settings.dart
@@ -370,8 +370,7 @@ class SettingsPage extends HookConsumerWidget {
                                                       TextSpan(
                                                         text:
                                                             "${e.name.trim()}\n",
-                                                        style: Theme.of(context)
-                                                            .textTheme
+                                                        style: theme.textTheme
                                                             .labelLarge,
                                                       ),
                                                       TextSpan(
diff --git a/lib/provider/user_preferences_provider.dart b/lib/provider/user_preferences_provider.dart
index f56b541d..4a92f1bf 100644
--- a/lib/provider/user_preferences_provider.dart
+++ b/lib/provider/user_preferences_provider.dart
@@ -246,7 +246,10 @@ class UserPreferences extends PersistedChangeNotifier {
   @override
   FutureOr<void> loadFromLocal(Map<String, dynamic> map) async {
     saveTrackLyrics = map["saveTrackLyrics"] ?? false;
-    recommendationMarket = map["recommendationMarket"] ?? recommendationMarket;
+    recommendationMarket = Market.values.firstWhere(
+      (market) =>
+          market.name == (map["recommendationMarket"] ?? recommendationMarket),
+    );
     checkUpdate = map["checkUpdate"] ?? checkUpdate;
 
     themeMode = ThemeMode.values[map["themeMode"] ?? 0];
@@ -306,7 +309,7 @@ class UserPreferences extends PersistedChangeNotifier {
   FutureOr<Map<String, dynamic>> toMap() {
     return {
       "saveTrackLyrics": saveTrackLyrics,
-      "recommendationMarket": recommendationMarket,
+      "recommendationMarket": recommendationMarket.name,
       "themeMode": themeMode.index,
       "accentColorScheme": accentColorScheme.toString(),
       "albumColorSync": albumColorSync,