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 6eab082634..0af09439b5 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
@@ -6387,13 +6387,12 @@ SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messag
 SEARCH chat_items USING COVERING INDEX sqlite_autoindex_chat_items_1 (created_by_msg_id=?)
 SEARCH pending_group_messages USING COVERING INDEX idx_pending_group_messages_message_id (message_id=?)
 
-Query: DELETE FROM messages WHERE message_id IN (SELECT message_id FROM chat_item_messages WHERE chat_item_id IN (SELECT chat_item_id FROM chat_items WHERE user_id = ? AND group_id = ?  AND group_member_id = ? ))
+Query: DELETE FROM messages WHERE message_id IN (SELECT m.message_id FROM chat_item_messages m JOIN chat_items i ON i.chat_item_id = m.chat_item_id WHERE i.user_id = ? AND i.group_id = ?  AND group_member_id = ? )
 Plan:
 SEARCH messages USING INTEGER PRIMARY KEY (rowid=?)
-LIST SUBQUERY 2
-SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messages_2 (chat_item_id=?)
 LIST SUBQUERY 1
-SEARCH chat_items USING COVERING INDEX idx_chat_items_group_shared_msg_id (user_id=? AND group_id=? AND group_member_id=?)
+SEARCH i USING COVERING INDEX idx_chat_items_group_shared_msg_id (user_id=? AND group_id=? AND group_member_id=?)
+SEARCH m USING COVERING INDEX sqlite_autoindex_chat_item_messages_2 (chat_item_id=?)
 SEARCH delivery_tasks USING COVERING INDEX idx_delivery_tasks_message_id (message_id=?)
 SEARCH msg_deliveries USING COVERING INDEX idx_msg_deliveries_message_id (message_id=?)
 SEARCH chat_item_moderations USING COVERING INDEX idx_chat_item_moderations_created_by_msg_id (created_by_msg_id=?)
@@ -6402,13 +6401,12 @@ SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messag
 SEARCH chat_items USING COVERING INDEX sqlite_autoindex_chat_items_1 (created_by_msg_id=?)
 SEARCH pending_group_messages USING COVERING INDEX idx_pending_group_messages_message_id (message_id=?)
 
-Query: DELETE FROM messages WHERE message_id IN (SELECT message_id FROM chat_item_messages WHERE chat_item_id IN (SELECT chat_item_id FROM chat_items WHERE user_id = ? AND group_id = ?  AND group_member_id IS NULL AND item_sent = 1 ))
+Query: DELETE FROM messages WHERE message_id IN (SELECT m.message_id FROM chat_item_messages m JOIN chat_items i ON i.chat_item_id = m.chat_item_id WHERE i.user_id = ? AND i.group_id = ?  AND group_member_id IS NULL AND item_sent = 1 )
 Plan:
 SEARCH messages USING INTEGER PRIMARY KEY (rowid=?)
-LIST SUBQUERY 2
-SEARCH chat_item_messages USING COVERING INDEX sqlite_autoindex_chat_item_messages_2 (chat_item_id=?)
 LIST SUBQUERY 1
-SEARCH chat_items USING INDEX idx_chat_items_group_shared_msg_id (user_id=? AND group_id=? AND group_member_id=?)
+SEARCH i USING INDEX idx_chat_items_group_shared_msg_id (user_id=? AND group_id=? AND group_member_id=?)
+SEARCH m USING COVERING INDEX sqlite_autoindex_chat_item_messages_2 (chat_item_id=?)
 SEARCH delivery_tasks USING COVERING INDEX idx_delivery_tasks_message_id (message_id=?)
 SEARCH msg_deliveries USING COVERING INDEX idx_msg_deliveries_message_id (message_id=?)
 SEARCH chat_item_moderations USING COVERING INDEX idx_chat_item_moderations_created_by_msg_id (created_by_msg_id=?)