diff --git a/server/src/__tests__/company-artifacts-service.test.ts b/server/src/__tests__/company-artifacts-service.test.ts
index dc90cc09d66..109d0e665da 100644
--- a/server/src/__tests__/company-artifacts-service.test.ts
+++ b/server/src/__tests__/company-artifacts-service.test.ts
@@ -397,6 +397,12 @@ describeEmbeddedPostgres("companyArtifactsService", () => {
     expect(second.status).toBe(200);
     expect(second.body.artifacts.map((artifact: { title: string }) => artifact.title)).toEqual(["User Upload Notes"]);
     expect(second.body.artifacts.every((artifact: { source: string }) => artifact.source === "document")).toBe(true);
+
+    const incompatibleKind = await request(app).get(
+      `/api/companies/${companyId}/artifacts?starred=true&kind=image`,
+    );
+    expect(incompatibleKind.status).toBe(200);
+    expect(incompatibleKind.body).toEqual({ artifacts: [], nextCursor: null });
   });
 
   it("returns an empty starred view for agent callers", async () => {
diff --git a/server/src/__tests__/resource-memberships-routes.test.ts b/server/src/__tests__/resource-memberships-routes.test.ts
index f2d9b08964e..92e45572d17 100644
--- a/server/src/__tests__/resource-memberships-routes.test.ts
+++ b/server/src/__tests__/resource-memberships-routes.test.ts
@@ -429,12 +429,14 @@ describeEmbeddedPostgres("resource membership routes", () => {
     const { companyId, documentId } = await seed();
     const app = createApp(db, boardActor(companyId));
 
-    const first = await request(app)
-      .put(`/api/companies/${companyId}/resource-memberships/me/documents/${documentId}`)
-      .send({ starred: true });
-    const second = await request(app)
-      .put(`/api/companies/${companyId}/resource-memberships/me/documents/${documentId}`)
-      .send({ starred: true });
+    const [first, second] = await Promise.all([
+      request(app)
+        .put(`/api/companies/${companyId}/resource-memberships/me/documents/${documentId}`)
+        .send({ starred: true }),
+      request(app)
+        .put(`/api/companies/${companyId}/resource-memberships/me/documents/${documentId}`)
+        .send({ starred: true }),
+    ]);
     const list = await request(app).get(`/api/companies/${companyId}/resource-memberships/me`);
 
     expect(first.status).toBe(200);
diff --git a/server/src/services/company-artifacts.ts b/server/src/services/company-artifacts.ts
index 929cc0bfb19..8b75a1015f5 100644
--- a/server/src/services/company-artifacts.ts
+++ b/server/src/services/company-artifacts.ts
@@ -348,7 +348,7 @@ export function companyArtifactsService(db: Db, storage?: StorageService) {
       const artifactSortDates = new Map<string, string>();
       const workProductAttachmentIds = new Set<string>();
 
-      if (query.starred || query.kind === "all" || query.kind === "document") {
+      if (query.kind === "all" || query.kind === "document") {
         const createdAgent = alias(agents, "document_created_agent");
         const updatedAgent = alias(agents, "document_updated_agent");
         const documentArtifactId = sql<string>`concat('document:', ${documents.id})`;
diff --git a/server/src/services/resource-memberships.ts b/server/src/services/resource-memberships.ts
index a52c71b6b26..276e49d2389 100644
--- a/server/src/services/resource-memberships.ts
+++ b/server/src/services/resource-memberships.ts
@@ -1,4 +1,4 @@
-import { and, eq } from "drizzle-orm";
+import { and, eq, sql } from "drizzle-orm";
 import type { Db } from "@paperclipai/db";
 import {
   agentMemberships,
@@ -491,19 +491,23 @@ export function resourceMembershipService(db: Db, options: ResourceMembershipSer
           .onConflictDoUpdate({
             target: [documentMemberships.companyId, documentMemberships.userId, documentMemberships.documentId],
             set: {
-              starredAt: now,
-              updatedAt: now,
+              starredAt: sql`${documentMemberships.starredAt}`,
+              updatedAt: sql`${documentMemberships.updatedAt}`,
             },
           })
-          .returning();
+          .returning({
+            starredAt: documentMemberships.starredAt,
+            updatedAt: documentMemberships.updatedAt,
+            inserted: sql<boolean>`xmax = 0`,
+          });
         return {
           resourceType: "document",
           resourceId: input.documentId,
           state: "joined",
           starredAt: row?.starredAt ?? now,
           updatedAt: row?.updatedAt ?? now,
-          changed: true,
-          changeKind: "starred",
+          changed: row?.inserted === true,
+          changeKind: row?.inserted === true ? "starred" : null,
           policySource: decision.source ?? "oss_default",
         };
       }