diff --git a/src/modules/decks/use-cases/get-random-card-in-deck-use-case.ts b/src/modules/decks/use-cases/get-random-card-in-deck-use-case.ts
index c67380c..2501960 100644
--- a/src/modules/decks/use-cases/get-random-card-in-deck-use-case.ts
+++ b/src/modules/decks/use-cases/get-random-card-in-deck-use-case.ts
@@ -52,12 +52,12 @@ export class GetRandomCardInDeckHandler implements ICommandHandler<GetRandomCard
     const randomCard = await this.getSmartRandomCard(cards)
 
     if (!randomCard) {
-      this.logger.error(`No cards found in deck with id ${randomCard.deckId}`, {
+      this.logger.error(`No cards found in deck}`, {
         previousCardId,
         randomCard,
         cards,
       })
-      throw new NotFoundException(`No cards found in deck with id ${randomCard.deckId}`)
+      throw new NotFoundException(`No cards found in deck`)
     }
     if (randomCard.id === previousCardId && cards.length !== 1) {
       return this.getNotDuplicateRandomCard(cards, previousCardId)
@@ -78,6 +78,11 @@ export class GetRandomCardInDeckHandler implements ICommandHandler<GetRandomCard
       command.userId,
       command.deckId
     )
+
+    if (!cards.length) {
+      throw new NotFoundException(`No cards found in deck with id ${command.deckId}`)
+    }
+
     const smartRandomCard = await this.getNotDuplicateRandomCard(cards, command.previousCardId)
 
     return {