diff --git a/Makefile b/Makefile
index 2694578..55fbcef 100644
--- a/Makefile
+++ b/Makefile
@@ -149,6 +149,8 @@ appstore:
 # Start a nextcloud server on Docker to kickstart developement
 .PHONY: appstore
 dev: build
+	docker stop repod || true
+	docker rm repod || true
 	docker build -t repod .
-	docker run -itd -v $(CURDIR):/var/www/html/apps/repod -p 80:80 repod
+	docker run -itd --name repod -v $(CURDIR):/var/www/html/apps/repod -p 80:80 repod
 	npm run watch
diff --git a/src/components/Feed/List.vue b/src/components/Feed/List.vue
index 310069f..079b270 100644
--- a/src/components/Feed/List.vue
+++ b/src/components/Feed/List.vue
@@ -17,12 +17,17 @@
 					{{ formatTimer(new Date(episode.episodeDuration*1000)) }}
 				</template>
 				<template #actions>
-					<NcActionButton @click="isCurrentEpisode(episode) ? load(null) : load(episode)">
+					<NcActionButton v-if="!isCurrentEpisode(episode)" @click="load(episode)">
 						<template #icon>
-							<PlayButton v-if="!isCurrentEpisode(episode)" :size="20" />
-							<StopButton v-if="isCurrentEpisode(episode)" :size="20" />
+							<PlayButton :size="20" />
 						</template>
-						{{ isCurrentEpisode(episode) ? t('Stop') : t('Play') }}
+						{{ t('Play') }}
+					</NcActionButton>
+					<NcActionButton v-if="isCurrentEpisode(episode)" @click="load(null)">
+						<template #icon>
+							<StopButton :size="20" />
+						</template>
+						{{ t('Stop') }}
 					</NcActionButton>
 				</template>
 			</NcListItem>
diff --git a/src/store/player.js b/src/store/player.js
index 4df7e3b..7a7c458 100644
--- a/src/store/player.js
+++ b/src/store/player.js
@@ -24,7 +24,7 @@ export const player = {
 		loaded: false,
 		paused: null,
 		podcastUrl: null,
-		volume: null,
+		volume: 1,
 	},
 	mutations: {
 		action: (state, action) => {
@@ -67,8 +67,10 @@ export const player = {
 	actions: {
 		load: async (context, episode) => {
 			context.commit('episode', episode)
-			const action = await axios.get(generateUrl('/apps/repod/episodes/action?url={url}', { url: episode.episodeUrl }))
-			context.commit('action', action.data)
+			try {
+				const action = await axios.get(generateUrl('/apps/repod/episodes/action?url={url}', { url: episode.episodeUrl }))
+				context.commit('action', action.data)
+			} catch {}
 		},
 		pause: (context) => {
 			audio.pause()