diff --git a/packages/cli/src/ErrorReporting.ts b/packages/cli/src/ErrorReporting.ts
index a1590cf29a..66ff5f0ba1 100644
--- a/packages/cli/src/ErrorReporting.ts
+++ b/packages/cli/src/ErrorReporting.ts
@@ -25,11 +25,17 @@ export const initErrorHandling = () => {
 		release,
 		environment,
 		integrations: (integrations) => {
+			integrations = integrations.filter(({ name }) => name !== 'OnUncaughtException');
 			integrations.push(new RewriteFrames({ root: process.cwd() }));
 			return integrations;
 		},
 	});
 
+	process.on('uncaughtException', (error) => {
+		ErrorReporterProxy.error(error);
+		if (error.constructor?.name !== 'AxiosError') throw error;
+	});
+
 	ErrorReporterProxy.init({
 		report: (error, options) => Sentry.captureException(error, options),
 	});
diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
index f37261b3b3..cb81e59ed6 100644
--- a/packages/cli/src/telemetry/index.ts
+++ b/packages/cli/src/telemetry/index.ts
@@ -187,15 +187,12 @@ export class Telemetry {
 					properties: updatedProperties,
 				};
 
-				if (withPostHog && this.postHog) {
-					return Promise.all([
-						this.postHog.capture({
-							distinctId: payload.userId,
-							sendFeatureFlags: true,
-							...payload,
-						}),
-						this.rudderStack.track(payload),
-					]).then(() => resolve());
+				if (withPostHog) {
+					this.postHog?.capture({
+						distinctId: payload.userId,
+						sendFeatureFlags: true,
+						...payload,
+					});
 				}
 
 				return this.rudderStack.track(payload, resolve);