diff --git a/packages/frontend/editor-ui/src/app/plugins/telemetry/index.ts b/packages/frontend/editor-ui/src/app/plugins/telemetry/index.ts
index 19ec8fe0998..acf7c1c410f 100644
--- a/packages/frontend/editor-ui/src/app/plugins/telemetry/index.ts
+++ b/packages/frontend/editor-ui/src/app/plugins/telemetry/index.ts
@@ -64,16 +64,11 @@ export class Telemetry {
 		});
 
 		this.identify({ instanceId, userId, versionCli, projectId, userRole });
-		this.groupIdentify({ instanceId });
 
 		this.flushPageEvents();
 		this.track('Session started', { session_id: rootStore.pushRef });
 	}
 
-	groupIdentify({ instanceId }: { instanceId: string }) {
-		usePostHog()?.groupIdentify?.('company', instanceId);
-	}
-
 	identify({ instanceId, userId, versionCli, projectId, userRole }: TelemetryIdentifyOptions) {
 		const settingsStore = useSettingsStore();
 		const traits: {
diff --git a/packages/frontend/editor-ui/src/app/stores/posthog.store.ts b/packages/frontend/editor-ui/src/app/stores/posthog.store.ts
index 3f4d44fd8c9..cf62c396331 100644
--- a/packages/frontend/editor-ui/src/app/stores/posthog.store.ts
+++ b/packages/frontend/editor-ui/src/app/stores/posthog.store.ts
@@ -187,6 +187,7 @@ export const usePostHog = defineStore('posthog', () => {
 
 		window.posthog?.init(config.apiKey, options);
 		identify();
+		groupIdentify('company', instanceId);
 
 		if (evaluatedFeatureFlags && Object.keys(evaluatedFeatureFlags).length) {
 			featureFlags.value = evaluatedFeatureFlags;