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 038f5e1bae45..a2e4035c7f60 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
@@ -3878,7 +3878,7 @@ private Map<String, Object> searchPaginatedAPIs(String searchQuery, int start, i
             log.debug("Original search query received : " + searchQuery);
         }
         String organizationID = null;
-        if (orgInfo != null) {
+        if (orgInfo != null && !StringUtils.isEmpty(orgInfo.getOrganizationId())) {
             organizationID = APIUtil.getOrganizationIdFromExternalReference(orgInfo.getOrganizationId(),
                     orgInfo.getName(), tenantDomain);
         }
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 b7a103a7ca01..5d4ea45fbd5b 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,9 +1187,12 @@ private APIDTO getAPIByAPIId(String apiId, String organization, OrganizationInfo
                 RestApiUtil.handleAuthorizationFailure(RestApiConstants.RESOURCE_API, apiId, log);
             }
 
-            if (!api.isAPIProduct()) {
-                String organizationID = APIUtil.getOrganizationIdFromExternalReference(userOrgInfo.getOrganizationId(),
-                        userOrgInfo.getName(), organization);
+            if (!api.isAPIProduct() ) {
+                String organizationID = null;
+                if (userOrgInfo != null && !StringUtils.isEmpty(userOrgInfo.getOrganizationId())) {
+                    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 fd7fd225e1ae..7c60aa3cfdbb 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
@@ -235,8 +235,11 @@ 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);
+                String organizationID = null;
+                if (userOrgInfo != null && !StringUtils.isEmpty(userOrgInfo.getOrganizationId())) {
+                    organizationID = APIUtil.getOrganizationIdFromExternalReference(userOrgInfo.getOrganizationId(),
+                            userOrgInfo.getName(), organization);
+                }
                 org.wso2.carbon.apimgt.rest.api.store.v1.utils.APIUtils
                         .updateAvailableTiersByOrganization(apiTypeWrapper.getApi(), organizationID);
             }
@@ -355,8 +358,11 @@ 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);
+                String organizationID = null;
+                if (userOrgInfo != null && !StringUtils.isEmpty(userOrgInfo.getOrganizationId())) {
+                    organizationID = APIUtil.getOrganizationIdFromExternalReference(userOrgInfo.getOrganizationId(),
+                            userOrgInfo.getName(), organization);
+                }
                 org.wso2.carbon.apimgt.rest.api.store.v1.utils.APIUtils
                         .updateAvailableTiersByOrganization(apiTypeWrapper.getApi(), organizationID);
             }
@@ -448,8 +454,11 @@ 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);
+                    String organizationID = null;
+                    if (userOrgInfo != null && !StringUtils.isEmpty(userOrgInfo.getOrganizationId())) {
+                        organizationID = APIUtil.getOrganizationIdFromExternalReference(userOrgInfo.getOrganizationId(),
+                                userOrgInfo.getName(), organization);
+                    }
                     org.wso2.carbon.apimgt.rest.api.store.v1.utils.APIUtils.updateAvailableTiersByOrganization(
                             apiTypeWrapper.getApi(), organizationID);
                 }