diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/APIManagementProviderServiceImpl.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/APIManagementProviderServiceImpl.java
index 525fb845eb..487177ed61 100644
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/APIManagementProviderServiceImpl.java
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/APIManagementProviderServiceImpl.java
@@ -155,12 +155,7 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
                 }
             }
             if (!needToSubscribe.isEmpty()) {
-                // TODO: Fix this properly
-                try {
-                    storeClient.getSubscriptionMultitpleApi().subscriptionsMultiplePost(needToSubscribe, CONTENT_TYPE);
-                } catch (Exception e){
-                    log.warn("Please check the API subscriptions.");
-                }
+                storeClient.getSubscriptionMultitpleApi().subscriptionsMultiplePost(needToSubscribe, CONTENT_TYPE);
             }
             //end of subscription
 
diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/src/main/resources/store-api.yaml b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/src/main/resources/store-api.yaml
index 5bdf610d34..8f85e25759 100644
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/src/main/resources/store-api.yaml
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/src/main/resources/store-api.yaml
@@ -1374,9 +1374,9 @@ paths:
             OK.
             Successful response with the newly created objects as entity in the body.
           schema:
-            $ref: '#/definitions/Subscription'
+            type: array
             items:
-              type: array
+              $ref: '#/definitions/Subscription'
           headers:
             Content-Type:
               description: |