diff --git a/convex/users.ts b/convex/users.ts
index a183556..852baa5 100644
--- a/convex/users.ts
+++ b/convex/users.ts
@@ -327,7 +327,7 @@ export const updateAvatar = mutation({
     // Atualiza snapshots de requester em tickets
     const requesterTickets = await ctx.db
       .query("tickets")
-      .withIndex("by_requester", (q) => q.eq("requesterId", user._id))
+      .withIndex("by_tenant_requester", (q) => q.eq("tenantId", user.tenantId).eq("requesterId", user._id))
       .take(10000)
 
     if (requesterTickets.length > 0) {
@@ -345,7 +345,7 @@ export const updateAvatar = mutation({
     // Atualiza snapshots de assignee em tickets
     const assigneeTickets = await ctx.db
       .query("tickets")
-      .withIndex("by_assignee", (q) => q.eq("assigneeId", user._id))
+      .withIndex("by_tenant_assignee", (q) => q.eq("tenantId", user.tenantId).eq("assigneeId", user._id))
       .take(10000)
 
     if (assigneeTickets.length > 0) {