diff --git a/src/helpers/CardDropHelper.ts b/src/helpers/CardDropHelper.ts
index d5d8743..6eec120 100644
--- a/src/helpers/CardDropHelper.ts
+++ b/src/helpers/CardDropHelper.ts
@@ -1,6 +1,5 @@
 import { CardRarity } from "../constants/CardRarity";
 import Card from "../database/entities/card/Card";
-import Series from "../database/entities/card/Series";
 
 export default class CardDropHelper {
     public static async GetRandomCard(): Promise<Card> {
@@ -17,18 +16,7 @@ export default class CardDropHelper {
         else if (randomRarity < goldChance) cardRarity = CardRarity.Gold;
         else cardRarity = CardRarity.Legendary;
 
-        const allSeries = await Series.FetchAll(Series, [ "Cards", "Cards.Series" ]);
-        const allSeriesWithCards = allSeries.filter(x => x.Cards.length > 0 && x.Cards.find(x => x.Rarity == cardRarity));
-
-        const randomSeriesIndex = Math.floor(Math.random() * allSeriesWithCards.length);
-
-        const randomSeries = allSeriesWithCards[randomSeriesIndex];
-
-        const allCards = randomSeries.Cards.filter(x => x.Rarity == cardRarity && x.Path && x.FileName);
-
-        const randomCardIndex = Math.floor(Math.random() * allCards.length);
-
-        const randomCard = allCards[randomCardIndex];
+        const randomCard = await this.GetRandomCardByRarity(cardRarity);
 
         return randomCard;
     }
diff --git a/yarn.lock b/yarn.lock
index e5ab839..96546a1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5218,9 +5218,9 @@ types-pkg-json@^1.1.0:
     types-json "^1.2.2"
 
 typescript@^5.0.0:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274"
-  integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
+  integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
 
 undici@5.22.1:
   version "5.22.1"