diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConsumerImpl.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConsumerImpl.java
index 7e94b505fd8a..038f5e1bae45 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConsumerImpl.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConsumerImpl.java
@@ -3879,7 +3879,8 @@ private Map<String, Object> searchPaginatedAPIs(String searchQuery, int start, i
         }
         String organizationID = null;
         if (orgInfo != null) {
-            organizationID = orgInfo.getOrganizationId();
+            organizationID = APIUtil.getOrganizationIdFromExternalReference(orgInfo.getOrganizationId(),
+                    orgInfo.getName(), tenantDomain);
         }
 
         try {
diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java
index 386e5ded55e3..9bf536e26e80 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java
@@ -3609,8 +3609,8 @@ public static void updateAvailableTiersByOrganization(DevPortalAPIInfo devPortal
         Set<OrganizationTiers> availableTiersForOrganizations = devPortalAPIInfo.getAvailableTiersForOrganizations();
         if (organization != null) {
             for (OrganizationTiers organizationTiers : availableTiersForOrganizations) {
-                String orgName = organizationTiers.getOrganizationID();
-                if (organization.equals(orgName)) {
+                String orgID = organizationTiers.getOrganizationID();
+                if (organization.equals(orgID)) {
                     availableTiers = organizationTiers.getTiers();
                     break;
                 }
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/ApisApiServiceImpl.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/ApisApiServiceImpl.java
index 6a652e0e8556..b7a103a7ca01 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/ApisApiServiceImpl.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/ApisApiServiceImpl.java
@@ -1188,8 +1188,10 @@ private APIDTO getAPIByAPIId(String apiId, String organization, OrganizationInfo
             }
 
             if (!api.isAPIProduct()) {
-                org.wso2.carbon.apimgt.rest.api.store.v1.utils.APIUtils
-                .updateAvailableTiersByOrganization(api.getApi(), userOrg);
+                String organizationID = APIUtil.getOrganizationIdFromExternalReference(userOrgInfo.getOrganizationId(),
+                        userOrgInfo.getName(), organization);
+                org.wso2.carbon.apimgt.rest.api.store.v1.utils.APIUtils.updateAvailableTiersByOrganization(
+                        api.getApi(), organizationID);
             }
 
             // Extracting clicked API name by the user, for the recommendation system
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/SubscriptionsApiServiceImpl.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/SubscriptionsApiServiceImpl.java
index 128e95344db1..fd7fd225e1ae 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/SubscriptionsApiServiceImpl.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/SubscriptionsApiServiceImpl.java
@@ -41,6 +41,7 @@
 import org.wso2.carbon.apimgt.api.model.Subscriber;
 import org.wso2.carbon.apimgt.api.model.SubscriptionResponse;
 import org.wso2.carbon.apimgt.impl.APIConstants;
+import org.wso2.carbon.apimgt.impl.utils.APIUtil;
 import org.wso2.carbon.apimgt.impl.workflow.HttpWorkflowResponse;
 import org.wso2.carbon.apimgt.rest.api.common.RestApiCommonUtil;
 import org.wso2.carbon.apimgt.rest.api.common.RestApiConstants;
@@ -234,8 +235,10 @@ public Response subscriptionsPost(SubscriptionDTO body, String xWSO2Tenant, Mess
             OrganizationInfo userOrgInfo = RestApiUtil.getOrganizationInfo(messageContext);
             userOrgInfo.setSuperOrganization(organization);
             if (!apiTypeWrapper.isAPIProduct()) {
+                String organizationID = APIUtil.getOrganizationIdFromExternalReference(userOrgInfo.getOrganizationId(),
+                        userOrgInfo.getName(), organization);
                 org.wso2.carbon.apimgt.rest.api.store.v1.utils.APIUtils
-                        .updateAvailableTiersByOrganization(apiTypeWrapper.getApi(), userOrgInfo.getOrganizationId());
+                        .updateAvailableTiersByOrganization(apiTypeWrapper.getApi(), organizationID);
             }
 
             apiTypeWrapper.setTier(body.getThrottlingPolicy());
@@ -352,8 +355,10 @@ public Response subscriptionsSubscriptionIdPut(String subscriptionId, Subscripti
             OrganizationInfo userOrgInfo = RestApiUtil.getOrganizationInfo(messageContext);
             userOrgInfo.setSuperOrganization(organization);
             if (!apiTypeWrapper.isAPIProduct()) {
+                String organizationID = APIUtil.getOrganizationIdFromExternalReference(userOrgInfo.getOrganizationId(),
+                        userOrgInfo.getName(), organization);
                 org.wso2.carbon.apimgt.rest.api.store.v1.utils.APIUtils
-                        .updateAvailableTiersByOrganization(apiTypeWrapper.getApi(), userOrgInfo.getOrganizationId());
+                        .updateAvailableTiersByOrganization(apiTypeWrapper.getApi(), organizationID);
             }
 
             apiTypeWrapper.setTier(body.getThrottlingPolicy());
@@ -443,8 +448,10 @@ public Response subscriptionsMultiplePost(List<SubscriptionDTO> body, String xWS
                 OrganizationInfo userOrgInfo = RestApiUtil.getOrganizationInfo(messageContext);
                 userOrgInfo.setSuperOrganization(organization);
                 if (!apiTypeWrapper.isAPIProduct()) {
+                    String organizationID = APIUtil.getOrganizationIdFromExternalReference(userOrgInfo.getOrganizationId(),
+                            userOrgInfo.getName(), organization);
                     org.wso2.carbon.apimgt.rest.api.store.v1.utils.APIUtils.updateAvailableTiersByOrganization(
-                            apiTypeWrapper.getApi(), userOrgInfo.getOrganizationId());
+                            apiTypeWrapper.getApi(), organizationID);
                 }
                 apiTypeWrapper.setTier(subscriptionDTO.getThrottlingPolicy());
                 SubscriptionResponse subscriptionResponse = apiConsumer