diff --git a/src/pages/settings/components/Theming/ThemeMiniCard.tsx b/src/pages/settings/components/Theming/ThemeMiniCard.tsx
index 242e0c6..13a7b6e 100644
--- a/src/pages/settings/components/Theming/ThemeMiniCard.tsx
+++ b/src/pages/settings/components/Theming/ThemeMiniCard.tsx
@@ -7,7 +7,7 @@ function ThemeMiniCard({
 	allThemes: Theme[];
 	item: number;
 }) {
-	const theme = allThemes.find((theme: Theme) => theme.id === item);
+	const theme = allThemes?.find((theme: Theme) => theme.id === item);
 
 	return (
 		<Group
diff --git a/src/pages/settings/components/Theming/ThemePlaylistModal.tsx b/src/pages/settings/components/Theming/ThemePlaylistModal.tsx
index 939a079..0b54bfd 100644
--- a/src/pages/settings/components/Theming/ThemePlaylistModal.tsx
+++ b/src/pages/settings/components/Theming/ThemePlaylistModal.tsx
@@ -227,7 +227,7 @@ function ThemePlaylistModal({
 					) : (
 						<SimpleGrid cols={3}>
 							{selectedPlaylist.name !== 'Time of Day' &&
-								allThemes.map((miniTheme: Theme) => {
+								allThemes?.map((miniTheme: Theme) => {
 									const newThemeList = themeList;
 									return (
 										<Group