diff --git a/src/oc_erchef/apps/oc_chef_authz/priv/pgsql_statements.config b/src/oc_erchef/apps/oc_chef_authz/priv/pgsql_statements.config
index 51e4506e95..b8f22f9baa 100644
--- a/src/oc_erchef/apps/oc_chef_authz/priv/pgsql_statements.config
+++ b/src/oc_erchef/apps/oc_chef_authz/priv/pgsql_statements.config
@@ -169,21 +169,21 @@
  {find_policy_by_group_asoc_and_name,
   <<"SELECT g.id, g.org_id, g.policy_group_name, g.policy_group_authz_id, g.policy_revision_revision_id, g.policy_revision_name, r.policy_authz_id, r.serialized_object
        FROM policy_revisions_policy_groups_association AS g
-  LEFT JOIN policy_revisions AS r ON (g.policy_revision_revision_id = r.revision_id)
+  LEFT JOIN policy_revisions AS r ON (r.org_id = g.org_id AND g.policy_revision_revision_id = r.revision_id)
       WHERE (g.org_id = $1 AND g.policy_group_name = $2 AND r.name = $3 )">>}.
 
  {find_all_policy_revisions_by_group_and_name,
   <<"SELECT g.id, g.policy_group_name, g.policy_group_authz_id,
             g.policy_revision_revision_id, g.policy_revision_name
        FROM policy_revisions_policy_groups_association AS g
-  LEFT JOIN policy_revisions AS r ON (g.policy_revision_revision_id = r.revision_id)
+  LEFT JOIN policy_revisions AS r ON (r.org_id = g.org_id AND g.policy_revision_revision_id = r.revision_id)
       WHERE (g.org_id = $1)">>}.
 
  {find_all_policy_revisions_associated_to_group,
   <<"SELECT g.id, g.policy_group_name, g.policy_group_authz_id,
             g.policy_revision_revision_id, g.policy_revision_name
        FROM policy_revisions_policy_groups_association AS g
-  LEFT JOIN policy_revisions AS r ON (g.policy_revision_revision_id = r.revision_id)
+  LEFT JOIN policy_revisions AS r ON (r.org_id = g.org_id AND g.policy_revision_revision_id = r.revision_id)
       WHERE (g.org_id = $1 AND g.policy_group_name = $2)">>}.
 
  {find_client_name_in_authz_ids, <<"SELECT name, authz_id FROM clients WHERE authz_id = ANY($1)">>}.