diff --git a/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx b/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx
index 6673673d9e..d594937c30 100644
--- a/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx
+++ b/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx
@@ -235,6 +235,7 @@ const CreateNewAppsOption = ({
     );
     if (devEnabled) {
       // fetch plugins information to show list of all plugins
+      AnalyticsUtil.logEvent("CREATE_APP_FROM_DATA");
       dispatch(fetchPlugins());
       dispatch(fetchMockDatasources());
       if (application?.workspaceId) {
@@ -291,6 +292,35 @@ const CreateNewAppsOption = ({
     }
   };
 
+  const addAnalyticEventsForSkip = () => {
+    if (useType === START_WITH_TYPE.TEMPLATE) {
+      if (selectedTemplate) {
+        const template = getTemplateById(selectedTemplate);
+        if (template) {
+          AnalyticsUtil.logEvent(
+            "ONBOARDING_FLOW_CLICK_SKIP_BUTTON_TEMPLATE_DETAILS_PAGE",
+            { title: template.title },
+          );
+        }
+      } else {
+        AnalyticsUtil.logEvent(
+          "ONBOARDING_FLOW_CLICK_SKIP_BUTTON_START_FROM_TEMPLATE_PAGE",
+        );
+      }
+    } else if (useType === START_WITH_TYPE.DATA) {
+      if (createNewAppPluginId) {
+        AnalyticsUtil.logEvent(
+          "ONBOARDING_FLOW_CLICK_SKIP_BUTTON_DATASOURCE_FORM_PAGE",
+          { pluginId: createNewAppPluginId },
+        );
+      } else {
+        AnalyticsUtil.logEvent(
+          "ONBOARDING_FLOW_CLICK_SKIP_BUTTON_START_FROM_DATA_PAGE",
+        );
+      }
+    }
+  };
+
   const onClickSkipButton = () => {
     if (application) {
       urlBuilder.updateURLParams(
@@ -312,9 +342,7 @@ const CreateNewAppsOption = ({
       );
     }
 
-    AnalyticsUtil.logEvent("START_FROM_TEMPLATES_CLICK_SKIP_BUTTON", {
-      startWithType: useType,
-    });
+    addAnalyticEventsForSkip();
   };
 
   const onClickBackButton = () => {
diff --git a/app/client/src/ce/utils/analyticsUtilTypes.ts b/app/client/src/ce/utils/analyticsUtilTypes.ts
index bdf4a370e7..d4b82fbb37 100644
--- a/app/client/src/ce/utils/analyticsUtilTypes.ts
+++ b/app/client/src/ce/utils/analyticsUtilTypes.ts
@@ -363,7 +363,11 @@ export type ONBOARDING_FLOW_EVENTS =
   | "ONBOARDING_FLOW_CLICK_BACK_BUTTON_START_FROM_DATA_PAGE"
   | "ONBOARDING_FLOW_CLICK_BACK_BUTTON_DATASOURCE_FORM_PAGE"
   | "ONBOARDING_FLOW_DATASOURCE_FORM_CANCEL_CLICK"
-  | "CREATE_APP_FROM_DATA";
+  | "CREATE_APP_FROM_DATA"
+  | "ONBOARDING_FLOW_CLICK_SKIP_BUTTON_START_FROM_DATA_PAGE"
+  | "ONBOARDING_FLOW_CLICK_SKIP_BUTTON_DATASOURCE_FORM_PAGE"
+  | "ONBOARDING_FLOW_CLICK_SKIP_BUTTON_START_FROM_TEMPLATE_PAGE"
+  | "ONBOARDING_FLOW_CLICK_SKIP_BUTTON_TEMPLATE_DETAILS_PAGE";
 
 export type DATASOURCE_SCHEMA_EVENTS =
   | "DATASOURCE_SCHEMA_SEARCH"
diff --git a/app/client/src/sagas/DatasourcesSagas.ts b/app/client/src/sagas/DatasourcesSagas.ts
index 91b0ff22c1..8099cc3878 100644
--- a/app/client/src/sagas/DatasourcesSagas.ts
+++ b/app/client/src/sagas/DatasourcesSagas.ts
@@ -1411,11 +1411,13 @@ function* fetchDatasourceStructureSaga(
         });
       }
       if (!!(response.data as any)?.error) {
+        isSuccess = false;
         errorMessage = (response.data as any).error?.message;
       }
     }
   } catch (error) {
     errorMessage = (error as any)?.message;
+    isSuccess = false;
     yield put({
       type: ReduxActionErrorTypes.FETCH_DATASOURCE_STRUCTURE_ERROR,
       payload: {
@@ -1528,10 +1530,12 @@ function* refreshDatasourceStructure(
         });
       }
       if (!!(response.data as any)?.error) {
-        errorMessage = (response.data as any)?.message;
+        isSuccess = false;
+        errorMessage = (response.data as any)?.error?.message;
       }
     }
   } catch (error) {
+    isSuccess = false;
     errorMessage = (error as any)?.message;
     yield put({
       type: ReduxActionErrorTypes.REFRESH_DATASOURCE_STRUCTURE_ERROR,