diff --git a/packages/api/src/resolvers/recommendations/index.ts b/packages/api/src/resolvers/recommendations/index.ts
index 72e7c5043..d2fed1092 100644
--- a/packages/api/src/resolvers/recommendations/index.ts
+++ b/packages/api/src/resolvers/recommendations/index.ts
@@ -204,8 +204,9 @@ export const recommendResolver = authorized<
       }
     }
 
+    // only recommend highlights created by the user
     const recommendedHighlightIds = input.recommendedWithHighlights
-      ? page.highlights?.map((h) => h.id)
+      ? page.highlights?.filter((h) => h.userId === uid)?.map((h) => h.id)
       : undefined
 
     const exp = Math.floor(Date.now() / 1000) + 60 * 60 * 24 // 1 day
diff --git a/packages/api/src/services/groups.ts b/packages/api/src/services/groups.ts
index 2776ef89a..73454c0a5 100644
--- a/packages/api/src/services/groups.ts
+++ b/packages/api/src/services/groups.ts
@@ -254,6 +254,7 @@ export const createLabelAndRuleForGroup = async (
         ],
       },
     ],
-    filter: `recommendedBy:"${groupName}"`,
+    // add a condition to check if the page is created
+    filter: `event:created recommendedBy:"${groupName}"`,
   })
 }