diff --git a/src/helpers/getOrgIdAndEntityTypewithEntitiesBasedOnPolicy.js b/src/helpers/getOrgIdAndEntityTypewithEntitiesBasedOnPolicy.js
index 7b9e6fbda..6844fc82d 100644
--- a/src/helpers/getOrgIdAndEntityTypewithEntitiesBasedOnPolicy.js
+++ b/src/helpers/getOrgIdAndEntityTypewithEntitiesBasedOnPolicy.js
@@ -64,6 +64,11 @@ module.exports = class OrganizationAndEntityTypePolicyHelper {
 					organizationInfo.push(orgExtension)
 					tenantCodes.push(orgExtension.tenant_code)
 				} else if (visibilityPolicy === common.ASSOCIATED || visibilityPolicy === common.ALL) {
+					// Always include the current org
+					organizationCodes.push(orgExtension.organization_code)
+					organizationInfo.push(orgExtension)
+					tenantCodes.push(orgExtension.tenant_code)
+
 					let relatedOrgs = []
 					let userOrgDetails = await userRequests.fetchOrgDetails({
 						organizationCode: orgExtension.organization_code,