diff --git a/src/components/Feed/Episodes.vue b/src/components/Feed/Episodes.vue
index cf5ed20..546b2d9 100644
--- a/src/components/Feed/Episodes.vue
+++ b/src/components/Feed/Episodes.vue
@@ -33,19 +33,17 @@
 						{{ t('repod', 'Stop') }}
 					</NcActionButton>
 				</template>
-				<template #extra>
-					<NcModal :show="modalEpisode && modalEpisode.guid === episode.guid" @close="modalEpisode = null">
-						<Modal :description="episode.description"
-							:image="episode.image"
-							:link="episode.link"
-							:name="episode.name"
-							:size="episode.size"
-							:title="episode.title"
-							:url="episode.url" />
-					</NcModal>
-				</template>
 			</NcListItem>
 		</ul>
+		<NcModal v-if="modalEpisode" @close="modalEpisode = null">
+			<Modal :description="modalEpisode.description"
+				:image="modalEpisode.image"
+				:link="modalEpisode.link"
+				:name="modalEpisode.name"
+				:size="modalEpisode.size"
+				:title="modalEpisode.title"
+				:url="modalEpisode.url" />
+		</NcModal>
 	</div>
 </template>
 
diff --git a/src/components/Player/Infos.vue b/src/components/Player/Infos.vue
index 6b85df9..294d276 100644
--- a/src/components/Player/Infos.vue
+++ b/src/components/Player/Infos.vue
@@ -6,7 +6,7 @@
 		<router-link :to="hash">
 			<i>{{ player.episode.title }}</i>
 		</router-link>
-		<NcModal :show="modal" @close="modal = false">
+		<NcModal v-if="modal" @close="modal = false">
 			<Modal :description="player.episode.description"
 				:image="player.episode.image"
 				:link="player.episode.link"