diff --git a/apps/meteor/app/cloud/server/functions/buildRegistrationData.ts b/apps/meteor/app/cloud/server/functions/buildRegistrationData.ts
index d65897b72094..00f51a4f1441 100644
--- a/apps/meteor/app/cloud/server/functions/buildRegistrationData.ts
+++ b/apps/meteor/app/cloud/server/functions/buildRegistrationData.ts
@@ -14,11 +14,11 @@ type WorkspaceRegistrationData<T> = {
 	seats: number;
 	allowMarketing: SettingValue;
 	accountName: SettingValue;
-	organizationType: unknown;
-	industry: unknown;
-	orgSize: unknown;
-	country: unknown;
-	language: unknown;
+	organizationType: string;
+	industry: string;
+	orgSize: string;
+	country: string;
+	language: string;
 	agreePrivacyTerms: SettingValue;
 	website: SettingValue;
 	siteName: SettingValue;
@@ -61,15 +61,15 @@ export async function buildWorkspaceRegistrationData<T extends string | undefine
 		seats,
 		allowMarketing,
 		accountName,
-		organizationType,
-		industry,
-		orgSize,
-		country,
-		language,
+		organizationType: String(organizationType),
+		industry: String(industry),
+		orgSize: String(orgSize),
+		country: String(country),
+		language: String(language),
 		agreePrivacyTerms,
 		website,
 		siteName,
-		workspaceType,
+		workspaceType: String(workspaceType),
 		deploymentMethod: stats.deploy.method,
 		deploymentPlatform: stats.deploy.platform,
 		version: stats.version,
diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace.ts
index 9a50eb62e57d..0dec84adeab2 100644
--- a/apps/meteor/app/cloud/server/functions/syncWorkspace.ts
+++ b/apps/meteor/app/cloud/server/functions/syncWorkspace.ts
@@ -41,6 +41,10 @@ const fetchSyncPayload = async ({ reconnectCheck = false }: { reconnectCheck?: b
 		body: info,
 	});
 
+	if (!response.ok) {
+		throw new CloudWorkspaceConnectionError(`Failed to connect to Rocket.Chat Cloud: ${response.statusText}`);
+	}
+
 	const payload = await response.json();
 
 	if (!payload) {
diff --git a/apps/meteor/app/statistics/server/lib/statistics.ts b/apps/meteor/app/statistics/server/lib/statistics.ts
index 8cfe45b42232..91c4f7141145 100644
--- a/apps/meteor/app/statistics/server/lib/statistics.ts
+++ b/apps/meteor/app/statistics/server/lib/statistics.ts
@@ -41,8 +41,6 @@ import { getAppsStatistics } from './getAppsStatistics';
 import { getImporterStatistics } from './getImporterStatistics';
 import { getServicesStatistics } from './getServicesStatistics';
 
-const wizardFields = ['Organization_Type', 'Industry', 'Size', 'Country', 'Language', 'Server_Type', 'Register_Server'];
-
 const getUserLanguages = async (totalUsers: number): Promise<{ [key: string]: number }> => {
 	const result = await Users.getUserLanguages();
 
@@ -70,17 +68,29 @@ export const statistics = {
 		const statistics = {} as IStats;
 		const statsPms = [];
 
+		const fetchWizardSettingValue = async <T>(settingName: string): Promise<T | undefined> => {
+			return ((await Settings.findOne(settingName))?.value as T | undefined) ?? undefined;
+		};
+
 		// Setup Wizard
-		statistics.wizard = {};
-		await Promise.all(
-			wizardFields.map(async (field) => {
-				const record = await Settings.findOne(field);
-				if (record) {
-					const wizardField = field.replace(/_/g, '').replace(field[0], field[0].toLowerCase());
-					statistics.wizard[wizardField] = record.value;
-				}
-			}),
-		);
+		const [organizationType, industry, size, country, language, serverType, registerServer] = await Promise.all([
+			fetchWizardSettingValue<string>('Organization_Type'),
+			fetchWizardSettingValue<string>('Industry'),
+			fetchWizardSettingValue<string>('Size'),
+			fetchWizardSettingValue<string>('Country'),
+			fetchWizardSettingValue<string>('Language'),
+			fetchWizardSettingValue<string>('Server_Type'),
+			fetchWizardSettingValue<boolean>('Register_Server'),
+		]);
+		statistics.wizard = {
+			organizationType,
+			industry,
+			size,
+			country,
+			language,
+			serverType,
+			registerServer,
+		};
 
 		// Version
 		const uniqueID = await Settings.findOne('uniqueID');
diff --git a/packages/core-typings/src/IStats.ts b/packages/core-typings/src/IStats.ts
index 2ea8115a727c..cd8aeb9f1762 100644
--- a/packages/core-typings/src/IStats.ts
+++ b/packages/core-typings/src/IStats.ts
@@ -6,7 +6,15 @@ import type { ITeamStats } from './ITeam';
 
 export interface IStats {
 	_id: string;
-	wizard: Record<string, unknown>;
+	wizard: {
+		organizationType?: string;
+		industry?: string;
+		size?: string;
+		country?: string;
+		language?: string;
+		serverType?: string;
+		registerServer?: boolean;
+	};
 	uniqueId: string;
 	installedAt?: string;
 	version?: string;