diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
index fdc42dcae6..7e6efcc122 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
@@ -4095,10 +4095,11 @@ Query:
                (CASE WHEN u.shown_badge_id = p.badge_purchase_id THEN 1 ELSE 0 END),
                p.alert_acked_kind, p.alert_acked_episode, p.alert_snooze_until,
                p.issue_failed_since, p.issue_error_at, p.issue_error, p.next_wake_at,
-               (CASE WHEN EXISTS (
-                  SELECT 1 FROM badge_ledger l
-                  WHERE l.badge_purchase_id = p.badge_purchase_id AND l.entry_type = 'credit' AND l.entry_credit_type = 'charge'
-                ) THEN 1 ELSE 0 END)
+               (SELECT l.change_months FROM badge_ledger l
+                WHERE l.badge_purchase_id = p.badge_purchase_id AND l.entry_type = 'credit' AND l.entry_credit_type = 'charge'
+                ORDER BY l.entry_id DESC
+                LIMIT 1),
+               p.subscription_status
         FROM badge_purchases p
         JOIN users u ON u.user_id = p.user_id
         WHERE p.badge_purchase_id = ? AND p.purchase_priv_key IS NOT NULL
@@ -5234,7 +5235,7 @@ SEARCH badge_purchases USING INTEGER PRIMARY KEY (rowid=?)
 Query: 
       UPDATE badge_store_receipts
       SET retry_delay = ?, next_attempt_at = ?, retry_count = retry_count + 1, credit_error = ?
-      WHERE badge_store_receipt_id = ? AND payment IS NOT NULL
+      WHERE badge_store_receipt_id = ? AND payment = ?
     
 Plan:
 SEARCH badge_store_receipts USING INTEGER PRIMARY KEY (rowid=?)
@@ -7348,6 +7349,10 @@ Query: SELECT 1 FROM settings WHERE user_id = ? LIMIT 1
 Plan:
 SEARCH settings USING COVERING INDEX idx_settings_user_id (user_id=?)
 
+Query: SELECT COUNT(*) FROM badge_code_redemptions
+Plan:
+SCAN badge_code_redemptions USING COVERING INDEX idx_badge_code_redemptions_user
+
 Query: SELECT COUNT(*) FROM badge_store_receipts
 Plan:
 SCAN badge_store_receipts USING COVERING INDEX idx_badge_store_receipts_user
@@ -7790,6 +7795,10 @@ Query: SELECT member_xcontact_id, member_welcome_shared_msg_id FROM group_member
 Plan:
 SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)
 
+Query: SELECT next_wake_at FROM badge_purchases
+Plan:
+SCAN badge_purchases
+
 Query: SELECT next_wake_at, badge_purchase_id FROM badge_purchases
 Plan:
 SCAN badge_purchases
@@ -7802,6 +7811,14 @@ Query: SELECT note_folder_id FROM note_folders WHERE user_id = ? LIMIT 1
 Plan:
 SEARCH note_folders USING COVERING INDEX note_folders_user_id (user_id=?)
 
+Query: SELECT payment, credit_error FROM badge_store_receipts WHERE user_id = ? AND payment IS NOT NULL
+Plan:
+SEARCH badge_store_receipts USING INDEX idx_badge_store_receipts_user (user_id=?)
+
+Query: SELECT payment, next_attempt_at FROM badge_store_receipts WHERE payment IS NOT NULL
+Plan:
+SCAN badge_store_receipts
+
 Query: SELECT purchase_key FROM badge_code_redemptions
 Plan:
 SCAN badge_code_redemptions
@@ -7886,6 +7903,10 @@ Query: SELECT stored_roster_version FROM groups WHERE group_id = ?
 Plan:
 SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
 
+Query: SELECT subscription_status FROM badge_purchases
+Plan:
+SCAN badge_purchases
+
 Query: SELECT summary_current_members_count FROM groups WHERE group_id = ?
 Plan:
 SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
@@ -7930,15 +7951,15 @@ Query: UPDATE badge_purchases SET next_wake_at = ? WHERE badge_purchase_id = ?
 Plan:
 SEARCH badge_purchases USING INTEGER PRIMARY KEY (rowid=?)
 
-Query: UPDATE badge_store_receipts SET next_attempt_at = ?
+Query: UPDATE badge_purchases SET subscription_status = ? WHERE badge_purchase_id = ?
 Plan:
-SCAN badge_store_receipts
+SEARCH badge_purchases USING INTEGER PRIMARY KEY (rowid=?)
 
 Query: UPDATE badge_store_receipts SET payment = ?
 Plan:
 SCAN badge_store_receipts
 
-Query: UPDATE badge_store_receipts SET payment = ? WHERE badge_store_receipt_id = ? AND payment IS NOT NULL
+Query: UPDATE badge_store_receipts SET payment = ?, next_attempt_at = ?, retry_delay = NULL, credit_error = NULL WHERE badge_store_receipt_id = ? AND payment = ?
 Plan:
 SEARCH badge_store_receipts USING INTEGER PRIMARY KEY (rowid=?)