diff --git a/api/chalicelib/core/sessions/sessions_notes.py b/api/chalicelib/core/sessions/sessions_notes.py
index e5790e51e..4844a3d41 100644
--- a/api/chalicelib/core/sessions/sessions_notes.py
+++ b/api/chalicelib/core/sessions/sessions_notes.py
@@ -74,7 +74,7 @@ def get_all_notes_by_project_id(tenant_id, project_id, user_id, data: schemas.Se
 
         # filter by ownership or shared status
         if data.shared_only:
-            conditions.append("sessions_notes.is_public")
+            conditions.append("sessions_notes.is_public IS TRUE")
         elif data.mine_only:
             conditions.append("sessions_notes.user_id = %(user_id)s")
         else:
diff --git a/ee/api/chalicelib/core/sessions/sessions_notes.py b/ee/api/chalicelib/core/sessions/sessions_notes.py
index a735c0339..beae46312 100644
--- a/ee/api/chalicelib/core/sessions/sessions_notes.py
+++ b/ee/api/chalicelib/core/sessions/sessions_notes.py
@@ -61,7 +61,8 @@ def get_all_notes_by_project_id(tenant_id, project_id, user_id, data: schemas.Se
         # base conditions
         conditions = [
             "sessions_notes.project_id = %(project_id)s",
-            "sessions_notes.deleted_at IS NULL"
+            "sessions_notes.deleted_at IS NULL",
+            "users.tenant_id = %(tenant_id)s"
         ]
         params = {"project_id": project_id, "user_id": user_id, "tenant_id": tenant_id}
 
@@ -75,7 +76,7 @@ def get_all_notes_by_project_id(tenant_id, project_id, user_id, data: schemas.Se
 
         # filter by ownership or shared status
         if data.shared_only:
-            conditions.append("sessions_notes.is_public")
+            conditions.append("sessions_notes.is_public IS TRUE")
         elif data.mine_only:
             conditions.append("sessions_notes.user_id = %(user_id)s")
         else: