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 4b554bc8b38a..7afb139e2c1d 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
@@ -3630,11 +3630,11 @@ public static void updateAvailableTiersByOrganization(DevPortalAPIInfo devPortal
                 String orgID = organizationTiers.getOrganizationID();
                 if (organization.equals(orgID)) {
                     availableTiers = organizationTiers.getTiers();
+                    devPortalAPIInfo.setAvailableTierNames(availableTiers);
                     break;
                 }
             }
         }
-        devPortalAPIInfo.setAvailableTierNames(availableTiers);
     }
 
     public static List<Tenant> getAllTenantsWithSuperTenant() throws UserStoreException {
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 5d4ea45fbd5b..46edb720d032 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
@@ -1187,12 +1187,9 @@ private APIDTO getAPIByAPIId(String apiId, String organization, OrganizationInfo
                 RestApiUtil.handleAuthorizationFailure(RestApiConstants.RESOURCE_API, apiId, log);
             }
 
-            if (!api.isAPIProduct() ) {
-                String organizationID = null;
-                if (userOrgInfo != null && !StringUtils.isEmpty(userOrgInfo.getOrganizationId())) {
-                    organizationID = APIUtil.getOrganizationIdFromExternalReference(userOrgInfo.getOrganizationId(),
+            if (!api.isAPIProduct() && !StringUtils.isEmpty(userOrgInfo.getOrganizationId())) {
+                String organizationID = APIUtil.getOrganizationIdFromExternalReference(userOrgInfo.getOrganizationId(),
                             userOrgInfo.getName(), organization);
-                }
                 org.wso2.carbon.apimgt.rest.api.store.v1.utils.APIUtils.updateAvailableTiersByOrganization(
                         api.getApi(), organizationID);
             }
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 7c60aa3cfdbb..63fe871e947a 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
@@ -234,12 +234,9 @@ public Response subscriptionsPost(SubscriptionDTO body, String xWSO2Tenant, Mess
 
             OrganizationInfo userOrgInfo = RestApiUtil.getOrganizationInfo(messageContext);
             userOrgInfo.setSuperOrganization(organization);
-            if (!apiTypeWrapper.isAPIProduct()) {
-                String organizationID = null;
-                if (userOrgInfo != null && !StringUtils.isEmpty(userOrgInfo.getOrganizationId())) {
-                    organizationID = APIUtil.getOrganizationIdFromExternalReference(userOrgInfo.getOrganizationId(),
+            if (!apiTypeWrapper.isAPIProduct() && !StringUtils.isEmpty(userOrgInfo.getOrganizationId())) {
+                String organizationID = APIUtil.getOrganizationIdFromExternalReference(userOrgInfo.getOrganizationId(),
                             userOrgInfo.getName(), organization);
-                }
                 org.wso2.carbon.apimgt.rest.api.store.v1.utils.APIUtils
                         .updateAvailableTiersByOrganization(apiTypeWrapper.getApi(), organizationID);
             }
@@ -357,12 +354,9 @@ public Response subscriptionsSubscriptionIdPut(String subscriptionId, Subscripti
 
             OrganizationInfo userOrgInfo = RestApiUtil.getOrganizationInfo(messageContext);
             userOrgInfo.setSuperOrganization(organization);
-            if (!apiTypeWrapper.isAPIProduct()) {
-                String organizationID = null;
-                if (userOrgInfo != null && !StringUtils.isEmpty(userOrgInfo.getOrganizationId())) {
-                    organizationID = APIUtil.getOrganizationIdFromExternalReference(userOrgInfo.getOrganizationId(),
+            if (!apiTypeWrapper.isAPIProduct() && !StringUtils.isEmpty(userOrgInfo.getOrganizationId())) {
+                String organizationID = APIUtil.getOrganizationIdFromExternalReference(userOrgInfo.getOrganizationId(),
                             userOrgInfo.getName(), organization);
-                }
                 org.wso2.carbon.apimgt.rest.api.store.v1.utils.APIUtils
                         .updateAvailableTiersByOrganization(apiTypeWrapper.getApi(), organizationID);
             }
@@ -453,12 +447,9 @@ public Response subscriptionsMultiplePost(List<SubscriptionDTO> body, String xWS
 
                 OrganizationInfo userOrgInfo = RestApiUtil.getOrganizationInfo(messageContext);
                 userOrgInfo.setSuperOrganization(organization);
-                if (!apiTypeWrapper.isAPIProduct()) {
-                    String organizationID = null;
-                    if (userOrgInfo != null && !StringUtils.isEmpty(userOrgInfo.getOrganizationId())) {
-                        organizationID = APIUtil.getOrganizationIdFromExternalReference(userOrgInfo.getOrganizationId(),
+                if (!apiTypeWrapper.isAPIProduct() && !StringUtils.isEmpty(userOrgInfo.getOrganizationId())) {
+                    String organizationID = APIUtil.getOrganizationIdFromExternalReference(userOrgInfo.getOrganizationId(),
                                 userOrgInfo.getName(), organization);
-                    }
                     org.wso2.carbon.apimgt.rest.api.store.v1.utils.APIUtils.updateAvailableTiersByOrganization(
                             apiTypeWrapper.getApi(), organizationID);
                 }
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/utils/APIUtils.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/utils/APIUtils.java
index 728ec19853f8..eb67425e3c79 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/utils/APIUtils.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/utils/APIUtils.java
@@ -235,11 +235,11 @@ public static void updateAvailableTiersByOrganization(API api, String organizati
                 String orgName = organizationTiers.getOrganizationID();
                 if (organization.equals(orgName)) {
                     availableTiers = organizationTiers.getTiers();
+                    api.removeAllTiers();
+                    api.setAvailableTiers(availableTiers);
                     break;
                 }
             }
         }
-        api.removeAllTiers();
-        api.setAvailableTiers(availableTiers);
     }
 }