diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt/src/main/java/org/wso2/carbon/apimgt/keymgt/model/impl/SubscriptionDataStoreImpl.java b/components/apimgt/org.wso2.carbon.apimgt.keymgt/src/main/java/org/wso2/carbon/apimgt/keymgt/model/impl/SubscriptionDataStoreImpl.java
index 78056f7b2141..237f4ccdc9cf 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.keymgt/src/main/java/org/wso2/carbon/apimgt/keymgt/model/impl/SubscriptionDataStoreImpl.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.keymgt/src/main/java/org/wso2/carbon/apimgt/keymgt/model/impl/SubscriptionDataStoreImpl.java
@@ -775,8 +775,12 @@ public Map<String, API> getAllAPIsByContextList() {
             apiContextAPIMap.put(api.getContext(), api);
             if (api.isDefaultVersion()) {
                 String context = api.getContext();
+                String defaultContext = context;
                 int index =  context.lastIndexOf("/" + api.getApiVersion());
-                apiContextAPIMap.put(context.substring(0, index), api);
+                if (index != -1) {
+                    defaultContext = context.substring(0, index);
+                }
+                apiContextAPIMap.put(defaultContext, api);
             }
         }
         return apiContextAPIMap;