diff --git a/src/components/CardImagesDisplay.vue b/src/components/CardImagesDisplay.vue
index 903dbe8..b63c2eb 100644
--- a/src/components/CardImagesDisplay.vue
+++ b/src/components/CardImagesDisplay.vue
@@ -87,6 +87,8 @@ export default {
         if (season % 2 === 0) season--
         else season -= 2
 
+        season = Math.max(season, 1)
+
         if (this.cardImage1UrlBySeasonNumber.has(season)
           && currentImage !== this.cardImage1UrlBySeasonNumber.get(season)) {
           return true
@@ -97,10 +99,12 @@ export default {
     hasNextCard(): boolean {
       const currentImage = this.cardImage1UrlBySeasonNumber.get(this.currentSeasonNumber)
       let season = this.currentSeasonNumber
-      while (season <= CURRENT_SEASON) {
+      while (season < CURRENT_SEASON) {
         if (season % 2 === 0) season++
         else season += 2
 
+        season = Math.min(season, CURRENT_SEASON)
+
         if (this.cardImage1UrlBySeasonNumber.has(season)
           && currentImage !== this.cardImage1UrlBySeasonNumber.get(season)) {
           return true