diff --git a/src/base/player.py b/src/base/player.py
index 8b03fa2..a053e0c 100644
--- a/src/base/player.py
+++ b/src/base/player.py
@@ -737,5 +737,6 @@ def generate_daily_gift(user: UserModel):
     items = random.choices(items, k=random.randint(1, 3))
     daily_gift.items = [item.name for item in items]
     daily_gift.is_claimed = False
+    daily_gift.next_claimable_at = datetime.utcnow() + timedelta(days=1)
     database.daily_gifts.update(**daily_gift.to_dict())
     return daily_gift
diff --git a/src/bot/callback.py b/src/bot/callback.py
index 255d0b9..862a936 100644
--- a/src/bot/callback.py
+++ b/src/bot/callback.py
@@ -814,6 +814,7 @@ def daily_gift_callback(call: CallbackQuery):
         daily_gift.last_claimed_at = now
         daily_gift.next_claimable_at = now + timedelta(days=1)
         daily_gift.is_claimed = True
+        database.daily_gifts.update(**daily_gift.to_dict())
 
         mess = f"<b>{get_user_tag(user)} получил ежедневный подарок</b>\n\n"
         for item_name in daily_gift.items:
@@ -827,7 +828,6 @@ def daily_gift_callback(call: CallbackQuery):
                 user.coin += quantity
             mess += f"+{quantity} {item.name} {item.emoji}\n"
 
-        database.daily_gifts.update(**daily_gift.to_dict())
         markup = InlineMarkup.daily_gift(user, daily_gift)
         bot.edit_message_reply_markup(
             call.message.chat.id, call.message.id, reply_markup=markup
diff --git a/src/bot/handlers.py b/src/bot/handlers.py
index a4c560b..6658071 100644
--- a/src/bot/handlers.py
+++ b/src/bot/handlers.py
@@ -966,7 +966,11 @@ def daily_gift_cmd(message: Message):
 
     mess = "<b>Ежедневный подарок</b>"
 
-    if daily_gift.next_claimable_at > datetime.utcnow() + timedelta(days=1):
+    print(datetime.utcnow())
+    print(daily_gift.next_claimable_at)
+    print(daily_gift.next_claimable_at <= datetime.utcnow())
+
+    if daily_gift.next_claimable_at <= datetime.utcnow():
         daily_gift = generate_daily_gift(user)
 
     markup = InlineMarkup.daily_gift(user, daily_gift)