diff --git a/package.json b/package.json
index 84734e7..b8c7536 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "card-drop",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "main": "./dist/bot.js",
   "typings": "./dist",
   "scripts": {
diff --git a/src/helpers/DropHelpers/GetUnclaimedCardsHelper.ts b/src/helpers/DropHelpers/GetUnclaimedCardsHelper.ts
index 3264a98..94ce894 100644
--- a/src/helpers/DropHelpers/GetUnclaimedCardsHelper.ts
+++ b/src/helpers/DropHelpers/GetUnclaimedCardsHelper.ts
@@ -39,12 +39,11 @@ export default class GetUnclaimedCardsHelper {
         const allCards = CoreClient.Cards
             .flatMap(x => x.cards)
             .filter(x => x.type == rarity)
-            .filter(x => !claimedCards.find(y => y.CardNumber == x.id));
+            .filter(x => !claimedCards.find(y => y.CardNumber == x.id && y.Quantity > 0));
 
-        if (!allCards) {
-            AppLogger.LogError("CardDropHelperMetadata/GetRandomCardByRarityUnclaimed", `No cards found to randomise from, User Id: ${userId}, rarity: ${rarity}`);
-
-            return undefined;
+        if (!allCards || allCards.length == 0) {
+            // There is no card left unclaimed, fallback to any card
+            return GetCardsHelper.GetRandomCardByRarity(rarity);
         };
 
         const randomCardIndex = Math.floor(Math.random() * allCards.length);
diff --git a/src/helpers/EffectHelper.ts b/src/helpers/EffectHelper.ts
index 235ea08..09e096c 100644
--- a/src/helpers/EffectHelper.ts
+++ b/src/helpers/EffectHelper.ts
@@ -151,7 +151,7 @@ export default class EffectHelper {
             AppLogger.LogInfo("EffectHelper", `Created initial user entity for : ${userId}`);
         }
 
-        if (user.Currency < totalCost) {
+        if (!disabled && user.Currency < totalCost) {
             return `You don't have enough currency to buy this! You have \`${user.Currency} Currency\` and need \`${totalCost} Currency\`!`;
         }