diff --git a/src/lib/apis/sonarr/sonarrApi.ts b/src/lib/apis/sonarr/sonarrApi.ts
index f17ba2d..d1e289d 100644
--- a/src/lib/apis/sonarr/sonarrApi.ts
+++ b/src/lib/apis/sonarr/sonarrApi.ts
@@ -7,7 +7,6 @@ import { get } from 'svelte/store';
 import { settings } from '$lib/stores/settings.store';
 
 export type SonarrSeries = components['schemas']['SeriesResource'];
-// export type MovieFileResource = components['schemas']['MovieFileResource'];
 export type SonarrReleaseResource = components['schemas']['ReleaseResource'];
 export type SonarrDownload = components['schemas']['QueueResource'] & { series: SonarrSeries };
 export type DiskSpaceInfo = components['schemas']['DiskSpaceResource'];
@@ -39,32 +38,38 @@ export interface SonarrSeriesOptions {
 	};
 }
 
-export const SonarrApi = createClient<paths>({
-	baseUrl: env.PUBLIC_SONARR_BASE_URL,
-	headers: {
-		'X-Api-Key': env.PUBLIC_SONARR_API_KEY
-	}
-});
+export const sonarrAvailable = !!env.PUBLIC_SONARR_BASE_URL && !!env.PUBLIC_SONARR_API_KEY;
+
+export const SonarrApi =
+	env.PUBLIC_SONARR_BASE_URL && env.PUBLIC_SONARR_API_KEY
+		? createClient<paths>({
+				baseUrl: env.PUBLIC_SONARR_BASE_URL,
+				headers: {
+					'X-Api-Key': env.PUBLIC_SONARR_API_KEY
+				}
+		  })
+		: undefined;
 
 export const getSonarrSeries = (): Promise<SonarrSeries[]> =>
-	SonarrApi.get('/api/v3/series', {
+	SonarrApi?.get('/api/v3/series', {
 		params: {}
-	}).then((r) => r.data || []);
+	}).then((r) => r.data || []) || Promise.resolve([]);
 
-export const getSonarrSeriesByTvdbId = (tvdbId: number): Promise<SonarrSeries | undefined> =>
-	SonarrApi.get('/api/v3/series', {
-		params: {
-			query: {
-				tvdbId: tvdbId
-			}
-		}
-	}).then((r) => r.data?.find((m) => m.tvdbId === tvdbId));
+// export const getSonarrSeriesByTvdbId = (tvdbId: number): Promise<SonarrSeries | undefined> =>
+// 	SonarrApi?.get('/api/v3/series', {
+// 		params: {
+// 			query: {
+// 				tvdbId: tvdbId
+// 			}
+// 		}
+// 	}).then((r) => r.data?.find((m) => m.tvdbId === tvdbId)) || Promise.resolve(undefined);
 
-export const getRadarrDownloadById = (sonarrId: number) =>
-	getSonarrDownloads().then((downloads) => downloads.find((d) => d.series.id === sonarrId));
+// export const getRadarrDownloadById = (sonarrId: number) =>
+// 	getSonarrDownloads().then((downloads) => downloads.find((d) => d.series.id === sonarrId)) ||
+// 	Promise.resolve(undefined);
 
 export const getDiskSpace = (): Promise<DiskSpaceInfo[]> =>
-	SonarrApi.get('/api/v3/diskspace', {}).then((d) => d.data || []);
+	SonarrApi?.get('/api/v3/diskspace', {}).then((d) => d.data || []) || Promise.resolve([]);
 
 export const addSeriesToSonarr = async (tmdbId: number) => {
 	const tmdbSeries = await getTmdbSeries(tmdbId);
@@ -87,48 +92,48 @@ export const addSeriesToSonarr = async (tmdbId: number) => {
 		seasonFolder: true
 	};
 
-	return SonarrApi.post('/api/v3/series', {
+	return SonarrApi?.post('/api/v3/series', {
 		params: {},
 		body: options
 	}).then((r) => r.data);
 };
 
-export const cancelDownloadSonarrEpisode = async (downloadId: number) => {
-	const deleteResponse = await SonarrApi.del('/api/v3/queue/{id}', {
-		params: {
-			path: {
-				id: downloadId
-			},
-			query: {
-				blocklist: false,
-				removeFromClient: true
-			}
-		}
-	}).then((r) => log(r));
+// export const cancelDownloadSonarrEpisode = async (downloadId: number) => {
+// 	const deleteResponse = await SonarrApi?.del('/api/v3/queue/{id}', {
+// 		params: {
+// 			path: {
+// 				id: downloadId
+// 			},
+// 			query: {
+// 				blocklist: false,
+// 				removeFromClient: true
+// 			}
+// 		}
+// 	}).then((r) => log(r));
 
-	return deleteResponse.response.ok;
-};
+// 	return !!deleteResponse?.response.ok;
+// };
 
 export const downloadSonarrEpisode = (guid: string) =>
-	SonarrApi.post('/api/v3/release', {
+	SonarrApi?.post('/api/v3/release', {
 		params: {},
 		body: {
 			indexerId: 2,
 			guid
 		}
-	});
+	}).then((res) => res.response.ok) || Promise.resolve(false);
 
-export const deleteSonarrEpisode = (id: number) =>
-	SonarrApi.del('/api/v3/episodefile/{id}', {
-		params: {
-			path: {
-				id
-			}
-		}
-	}).then((res) => res.response.ok);
+// export const deleteSonarrEpisode = (id: number) =>
+// 	SonarrApi?.del('/api/v3/episodefile/{id}', {
+// 		params: {
+// 			path: {
+// 				id
+// 			}
+// 		}
+// 	}).then((res) => res.response.ok) || Promise.resolve(false);
 
 export const getSonarrDownloads = (): Promise<SonarrDownload[]> =>
-	SonarrApi.get('/api/v3/queue', {
+	SonarrApi?.get('/api/v3/queue', {
 		params: {
 			query: {
 				includeEpisode: true,
@@ -139,70 +144,76 @@ export const getSonarrDownloads = (): Promise<SonarrDownload[]> =>
 		(r) =>
 			(r.data?.records?.filter((record) => record.episode && record.series) as SonarrDownload[]) ||
 			[]
-	);
+	) || Promise.resolve([]);
 
-export const getSonarrDownloadsById = (sonarrId: number) =>
-	getSonarrDownloads().then((downloads) => downloads.filter((d) => d.seriesId === sonarrId));
+// export const getSonarrDownloadsById = (sonarrId: number) =>
+// 	getSonarrDownloads().then((downloads) => downloads.filter((d) => d.seriesId === sonarrId)) ||
+// 	Promise.resolve([]);
 
-export const removeFromSonarr = (id: number) =>
-	SonarrApi.del('/api/v3/series/{id}', {
-		params: {
-			path: {
-				id
-			}
-		}
-	}).then((res) => res.response.ok);
+// export const removeFromSonarr = (id: number): Promise<boolean> =>
+// 	SonarrApi?.del('/api/v3/series/{id}', {
+// 		params: {
+// 			path: {
+// 				id
+// 			}
+// 		}
+// 	}).then((res) => res.response.ok) || Promise.resolve(false);
 
-export const getSonarrEpisodes = async (seriesId: number) => {
-	const episodesPromise = SonarrApi.get('/api/v3/episode', {
-		params: {
-			query: {
-				seriesId
-			}
-		}
-	}).then((r) => r.data || []);
+// export const getSonarrEpisodes = async (seriesId: number) => {
+// 	const episodesPromise =
+// 		SonarrApi?.get('/api/v3/episode', {
+// 			params: {
+// 				query: {
+// 					seriesId
+// 				}
+// 			}
+// 		}).then((r) => r.data || []) || Promise.resolve([]);
 
-	const episodeFilesPromise = SonarrApi.get('/api/v3/episodefile', {
-		params: {
-			query: {
-				seriesId
-			}
-		}
-	}).then((r) => r.data || []);
+// 	const episodeFilesPromise =
+// 		SonarrApi?.get('/api/v3/episodefile', {
+// 			params: {
+// 				query: {
+// 					seriesId
+// 				}
+// 			}
+// 		}).then((r) => r.data || []) || Promise.resolve([]);
 
-	const [episodes, episodeFiles] = await Promise.all([episodesPromise, episodeFilesPromise]);
+// 	const episodes = await episodesPromise;
+// 	const episodeFiles = await episodeFilesPromise;
 
-	return episodes.map((episode) => ({
-		episode,
-		episodeFile: episodeFiles.find((file) => file.id === episode.episodeFileId)
-	}));
-};
+// 	return episodes.map((episode) => ({
+// 		episode,
+// 		episodeFile: episodeFiles.find((file) => file.id === episode.episodeFileId)
+// 	}));
+// };
 
 export const fetchSonarrReleases = async (episodeId: number) =>
-	SonarrApi.get('/api/v3/release', {
+	SonarrApi?.get('/api/v3/release', {
 		params: {
 			query: {
 				episodeId
 			}
 		}
-	}).then((r) => r.data || []);
+	}).then((r) => r.data || []) || Promise.resolve([]);
 
 export const fetchSonarrSeasonReleases = async (seriesId: number, seasonNumber: number) =>
-	SonarrApi.get('/api/v3/release', {
+	SonarrApi?.get('/api/v3/release', {
 		params: {
 			query: {
 				seriesId,
 				seasonNumber
 			}
 		}
-	}).then((r) => r.data || []);
+	}).then((r) => r.data || []) || Promise.resolve([]);
 
 export const fetchSonarrEpisodes = async (seriesId: number): Promise<SonarrEpisode[]> => {
-	return SonarrApi.get('/api/v3/episode', {
-		params: {
-			query: {
-				seriesId
+	return (
+		SonarrApi?.get('/api/v3/episode', {
+			params: {
+				query: {
+					seriesId
+				}
 			}
-		}
-	}).then((r) => r.data || []);
+		}).then((r) => r.data || []) || Promise.resolve([])
+	);
 };
diff --git a/src/lib/components/RequestModal/RequestModal.svelte b/src/lib/components/RequestModal/RequestModal.svelte
index ce1313a..c5e398b 100644
--- a/src/lib/components/RequestModal/RequestModal.svelte
+++ b/src/lib/components/RequestModal/RequestModal.svelte
@@ -77,10 +77,10 @@
 				}
 			});
 		} else {
-			downloadSonarrEpisode(guid).then((res) => {
+			downloadSonarrEpisode(guid).then((ok) => {
 				dispatch('download');
 				downloadFetchingGuid = undefined;
-				if (res.response?.ok) {
+				if (ok) {
 					downloadingGuid = guid;
 				}
 			});
diff --git a/src/lib/components/SourceStats/SonarrStats.svelte b/src/lib/components/SourceStats/SonarrStats.svelte
index c072e4a..68e9b09 100644
--- a/src/lib/components/SourceStats/SonarrStats.svelte
+++ b/src/lib/components/SourceStats/SonarrStats.svelte
@@ -1,12 +1,11 @@
 <script lang="ts">
-	import { formatSize } from '$lib/utils.js';
-	import { onMount } from 'svelte';
-	import StatsPlaceholder from './StatsPlaceholder.svelte';
-	import StatsContainer from './StatsContainer.svelte';
-	import SonarrIcon from '../svgs/SonarrIcon.svelte';
 	import { env } from '$env/dynamic/public';
 	import { getDiskSpace } from '$lib/apis/sonarr/sonarrApi';
 	import { library } from '$lib/stores/library.store';
+	import { formatSize } from '$lib/utils.js';
+	import SonarrIcon from '../svgs/SonarrIcon.svelte';
+	import StatsContainer from './StatsContainer.svelte';
+	import StatsPlaceholder from './StatsPlaceholder.svelte';
 
 	export let large = false;
 
@@ -18,7 +17,9 @@
 		);
 
 		const diskSpaceInfo =
-			(await discSpacePromise).find((disk) => disk.path === '/') || (await discSpacePromise)[0];
+			(await discSpacePromise).find((disk) => disk.path === '/') ||
+			(await discSpacePromise)[0] ||
+			undefined;
 
 		const spaceOccupied = availableSeries.reduce(
 			(acc, series) => acc + (series.sonarrSeries?.statistics?.sizeOnDisk || 0),
@@ -32,9 +33,9 @@
 
 		return {
 			episodesCount,
-			spaceLeft: diskSpaceInfo.freeSpace || 0,
+			spaceLeft: diskSpaceInfo?.freeSpace || 0,
 			spaceOccupied,
-			spaceTotal: diskSpaceInfo.totalSpace || 0
+			spaceTotal: diskSpaceInfo?.totalSpace || 0
 		};
 	}
 </script>
diff --git a/src/routes/series/[id]/SeriesPage.svelte b/src/routes/series/[id]/SeriesPage.svelte
index 20a038c..1deb40b 100644
--- a/src/routes/series/[id]/SeriesPage.svelte
+++ b/src/routes/series/[id]/SeriesPage.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import type { JellyfinItem } from '$lib/apis/jellyfin/jellyfinApi';
-	import { addSeriesToSonarr } from '$lib/apis/sonarr/sonarrApi';
+	import { type JellyfinItem } from '$lib/apis/jellyfin/jellyfinApi';
+	import { addSeriesToSonarr, sonarrAvailable } from '$lib/apis/sonarr/sonarrApi';
 	import {
 		getTmdbSeries,
 		getTmdbSeriesRecommendations,
@@ -187,11 +187,11 @@
 							</span>
 							<ChevronRight size={20} />
 						</Button>
-					{:else if !$itemStore.item?.sonarrSeries}
+					{:else if !$itemStore.item?.sonarrSeries && sonarrAvailable}
 						<Button type="primary" disabled={addToSonarrLoading} on:click={addToSonarr}>
 							<span>Add to Sonarr</span><Plus size={20} />
 						</Button>
-					{:else}
+					{:else if $itemStore.item?.sonarrSeries}
 						<Button type="primary" on:click={openRequestModal}>
 							<span class="mr-2">Request Series</span><Plus size={20} />
 						</Button>