diff --git a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/analytics/AnalyticsFilter.java b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/analytics/AnalyticsFilter.java
index f208dd00f..0eb82d008 100644
--- a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/analytics/AnalyticsFilter.java
+++ b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/analytics/AnalyticsFilter.java
@@ -144,8 +144,7 @@ public void handleSuccessRequest(RequestContext requestContext) {
             requestContext.addMetadataToMap(MetadataConstants.API_TYPE_KEY, apiType);
             requestContext.addMetadataToMap(MetadataConstants.IS_MOCK_API, String.valueOf(isMockAPI));
 
-            String tenantDomain = FilterUtils.getTenantDomainFromRequestURL(
-                    requestContext.getMatchedAPI().getBasePath());
+            String tenantDomain = requestContext.getMatchedAPI().getOrganizationId();
             requestContext.addMetadataToMap(MetadataConstants.API_CREATOR_TENANT_DOMAIN_KEY,
                     tenantDomain == null ? APIConstants.SUPER_TENANT_DOMAIN_NAME : tenantDomain);