diff --git a/pages/episode/episode.go b/pages/episode/episode.go
index aacc4001..63486df3 100644
--- a/pages/episode/episode.go
+++ b/pages/episode/episode.go
@@ -33,14 +33,11 @@ func Get(ctx *aero.Context) string {
 		return ctx.Error(http.StatusNotFound, "Anime episodes not found", err)
 	}
 
-	episode, _ := animeEpisodes.Find(episodeNumber)
+	episode, episodeIndex := animeEpisodes.Find(episodeNumber)
 
 	if episode == nil {
 		return ctx.Error(http.StatusNotFound, "Anime episode not found", nil)
 	}
 
-	_, previousIndex := animeEpisodes.Find(episodeNumber - 1)
-	_, nextIndex := animeEpisodes.Find(episodeNumber + 1)
-
-	return ctx.HTML(components.AnimeEpisode(anime, episode, user, previousIndex, nextIndex))
+	return ctx.HTML(components.AnimeEpisode(anime, episode, user, episodeIndex))
 }
diff --git a/pages/episode/episode.pixy b/pages/episode/episode.pixy
index 4403143b..252dea19 100644
--- a/pages/episode/episode.pixy
+++ b/pages/episode/episode.pixy
@@ -1,4 +1,4 @@
-component AnimeEpisode(anime *arn.Anime, episode *arn.AnimeEpisode, user *arn.User, previousIndex int, nextIndex int)
+component AnimeEpisode(anime *arn.Anime, episode *arn.AnimeEpisode, user *arn.User, episodeIndex int)
 	h1
 		a(href=anime.Link())= anime.Title.ByUser(user)
 
@@ -8,12 +8,12 @@ component AnimeEpisode(anime *arn.Anime, episode *arn.AnimeEpisode, user *arn.Us
 
 	h3.episode-view-number= "Episode " + strconv.Itoa(episode.Number)
 
-	//- if previousIndex != -1
-	//- 	a.button(href=anime.Link() + "/episode/" + strconv.Itoa(anime.Episodes().Items[previousIndex].Number))
+	//- if episodeIndex > 0
+	//- 	a.button(href=anime.Link() + "/episode/" + strconv.Itoa(anime.Episodes().Items[episodeIndex - 1].Number))
 	//- 		Icon("chevron-left")
 
-	//- if nextIndex != -1
-	//- 	a.button(href=anime.Link() + "/episode/" + strconv.Itoa(anime.Episodes().Items[nextIndex].Number))
+	//- if episodeIndex < len(anime.Episodes().Items) - 1
+	//- 	a.button(href=anime.Link() + "/episode/" + strconv.Itoa(anime.Episodes().Items[episodeIndex + 1].Number))
 	//- 		Icon("chevron-right")
 
 	if episode.Title.Japanese != ""